Skip to content

links suppoert current default rev context from request 'h' #1257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

links suppoert current default rev context from request 'h' #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 27 additions & 15 deletions src/main/java/com/gitblit/wicket/WicketUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.Request;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.behavior.SimpleAttributeModifier;
Expand Down Expand Up @@ -449,32 +450,43 @@ public static PageParameters newBlobDiffParameter(String repositoryName,
public static PageParameters newSearchParameter(String repositoryName,
String commitId, String search, Constants.SearchType type) {
Map<String, String> parameterMap = new HashMap<String, String>();
if (StringUtils.isEmpty(commitId)) {
parameterMap.put("r", repositoryName);
parameterMap.put("s", search);
parameterMap.put("st", type.name());
return new PageParameters(parameterMap);
}
setCommitIdIf(commitId, parameterMap);
parameterMap.put("r", repositoryName);
parameterMap.put("h", commitId);
parameterMap.put("s", search);
parameterMap.put("st", type.name());
return new PageParameters(parameterMap);
}

public static void setCommitIdIf(String commitId, Map<String, String> parameterMap) {
if (StringUtils.isEmpty(commitId)) {
final String branch = getRequestParameter("h");
if (!StringUtils.isEmpty(branch)) {
parameterMap.put("h", branch);
}
}else{
parameterMap.put("h", commitId);
}
}

protected static String getRequestParameter(final String key) {
final HttpServletRequest req = ((WebRequest)RequestCycle.get().getRequest()).getHttpServletRequest();
final String branch = req == null ? null : req.getParameter(key);
return branch;
}
public static void setCommitIdIf(final PageParameters params) {
if( params.get("h") == null ){
final String branch = getRequestParameter("h");
if (!StringUtils.isEmpty(branch)) {
params.put("h", branch);
}
}
}
public static PageParameters newSearchParameter(String repositoryName,
String commitId, String search, Constants.SearchType type,
int pageNumber) {
Map<String, String> parameterMap = new HashMap<String, String>();
if (StringUtils.isEmpty(commitId)) {
parameterMap.put("r", repositoryName);
parameterMap.put("s", search);
parameterMap.put("st", type.name());
parameterMap.put("pg", String.valueOf(pageNumber));
return new PageParameters(parameterMap);
}
setCommitIdIf(commitId, parameterMap);
parameterMap.put("r", repositoryName);
parameterMap.put("h", commitId);
parameterMap.put("s", search);
parameterMap.put("st", type.name());
parameterMap.put("pg", String.valueOf(pageNumber));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gitblit/wicket/pages/ComparePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ public ComparePage(PageParameters params) {
Repository r = getRepository();
RepositoryModel repository = getRepositoryModel();

if (StringUtils.isEmpty(objectId)) {
String[] parts = StringUtils.isEmpty(objectId) ? null : objectId.split("\\.\\.");
if ( parts == null || parts.length < 2) {
// seleciton form
add(new Label("comparison").setVisible(false));
} else {
Expand All @@ -89,7 +90,6 @@ public ComparePage(PageParameters params) {
RevCommit fromCommit;
RevCommit toCommit;

String[] parts = objectId.split("\\.\\.");
if (parts[0].startsWith("refs/") && parts[1].startsWith("refs/")) {
// set the ref models
fromRefId.setObject(parts[0]);
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,14 @@ private List<NavLink> registerNavLinks() {
return navLinks;
}

if( params != null ){
WicketUtils.setCommitIdIf(params);
}
navLinks.add(new PageNavLink("gb.commits", LogPage.class, objectParams));
navLinks.add(new PageNavLink("gb.tree", TreePage.class, objectParams));
if (app().tickets().isReady() && (app().tickets().isAcceptingNewTickets(model) || app().tickets().hasTickets(model))) {
PageParameters tParams = WicketUtils.newOpenTicketsParameter(getRepositoryName());
WicketUtils.setCommitIdIf(tParams);
navLinks.add(new PageNavLink("gb.tickets", TicketsPage.class, tParams));
}
navLinks.add(new PageNavLink("gb.docs", DocsPage.class, objectParams, true));
Expand Down