From 234572e359588e535c00a85715bec4450b7ff77d Mon Sep 17 00:00:00 2001
From: Steffen Gebert <steffen.gebert@typo3.org>
Date: Tue, 24 Mar 2015 16:21:13 -0400
Subject: [PATCH] Docs: Fix RPC URL
---
src/main/java/com/gitblit/wicket/pages/TicketPage.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index b690e4c..254d3c9 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -378,7 +378,7 @@
}
TicketModel update = app().tickets().updateTicket(repository, ticket.number, change);
app().tickets().createNotifier().sendMailing(update);
- setResponsePage(TicketsPage.class, getPageParameters());
+ redirectTo(TicketsPage.class, getPageParameters());
}
};
String css = TicketsUI.getStatusClass(item.getModel().getObject());
@@ -442,7 +442,7 @@
}
TicketModel update = app().tickets().updateTicket(repository, ticket.number, change);
app().tickets().createNotifier().sendMailing(update);
- setResponsePage(TicketsPage.class, getPageParameters());
+ redirectTo(TicketsPage.class, getPageParameters());
}
};
item.add(link);
@@ -487,7 +487,7 @@
}
TicketModel update = app().tickets().updateTicket(repository, ticket.number, change);
app().tickets().createNotifier().sendMailing(update);
- setResponsePage(TicketsPage.class, getPageParameters());
+ redirectTo(TicketsPage.class, getPageParameters());
}
};
item.add(link);
@@ -519,6 +519,10 @@
* TICKET METADATA
*/
add(new Label("ticketType", ticket.type.toString()));
+
+ add(new Label("priority", ticket.priority.toString()));
+ add(new Label("severity", ticket.severity.toString()));
+
if (StringUtils.isEmpty(ticket.topic)) {
add(new Label("ticketTopic").setVisible(false));
} else {
@@ -527,6 +531,8 @@
String safeTopic = app().xssFilter().relaxed(topic);
add(new Label("ticketTopic", safeTopic).setEscapeModelStrings(false));
}
+
+
/*
@@ -560,7 +566,7 @@
change.vote(user.username);
}
app().tickets().updateTicket(repository, ticket.number, change);
- setResponsePage(TicketsPage.class, getPageParameters());
+ redirectTo(TicketsPage.class, getPageParameters());
}
};
add(link);
@@ -600,7 +606,7 @@
change.watch(user.username);
}
app().tickets().updateTicket(repository, ticket.number, change);
- setResponsePage(TicketsPage.class, getPageParameters());
+ redirectTo(TicketsPage.class, getPageParameters());
}
};
add(link);
@@ -1297,7 +1303,7 @@
}
TicketModel updatedTicket = app().tickets().updateTicket(getRepositoryModel(), ticket.number, change);
app().tickets().createNotifier().sendMailing(updatedTicket);
- setResponsePage(TicketsPage.class, getPageParameters());
+ redirectTo(TicketsPage.class, getPageParameters());
}
protected <X extends MarkupContainer> X setNewTarget(X x) {
@@ -1408,8 +1414,8 @@
GitBlitWebSession.get().cacheErrorMessage(msg);
logger.error(msg);
}
-
- setResponsePage(TicketsPage.class, getPageParameters());
+
+ redirectTo(TicketsPage.class, getPageParameters());
}
};
mergePanel.add(mergeButton);
@@ -1424,6 +1430,12 @@
// patchset already merged
Fragment mergePanel = new Fragment("mergePanel", "alreadyMergedFragment", this);
mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetAlreadyMerged"), ticket.mergeTo)));
+ return mergePanel;
+ } else if (MergeStatus.MISSING_INTEGRATION_BRANCH == mergeStatus) {
+ // target/integration branch is missing
+ Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", this);
+ mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetNotMergeable"), ticket.mergeTo)));
+ mergePanel.add(new Label("mergeMore", MessageFormat.format(getString("gb.missingIntegrationBranchMore"), ticket.mergeTo)));
return mergePanel;
} else {
// patchset can not be cleanly merged
@@ -1503,7 +1515,7 @@
*/
protected RepositoryUrl getRepositoryUrl(UserModel user, RepositoryModel repository) {
HttpServletRequest req = ((WebRequest) getRequest()).getHttpServletRequest();
- List<RepositoryUrl> urls = app().gitblit().getRepositoryUrls(req, user, repository);
+ List<RepositoryUrl> urls = app().services().getRepositoryUrls(req, user, repository);
if (ArrayUtils.isEmpty(urls)) {
return null;
}
--
Gitblit v1.9.1