diff options
Diffstat (limited to 'src/main/java/com/gitblit')
| -rw-r--r-- | src/main/java/com/gitblit/tickets/BranchTicketService.java | 6 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/TicketPage.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/gitblit/tickets/BranchTicketService.java b/src/main/java/com/gitblit/tickets/BranchTicketService.java index 0f71d864..f23a3259 100644 --- a/src/main/java/com/gitblit/tickets/BranchTicketService.java +++ b/src/main/java/com/gitblit/tickets/BranchTicketService.java @@ -189,7 +189,7 @@ public class BranchTicketService extends ITicketService implements RefsChangedLi } /** - * Returns a RefModel for the refs/gitblit/tickets branch in the repository. + * Returns a RefModel for the refs/meta/gitblit/tickets branch in the repository. * If the branch can not be found, null is returned. * * @return a refmodel for the gitblit tickets branch or null @@ -227,7 +227,7 @@ public class BranchTicketService extends ITicketService implements RefsChangedLi } /** - * Creates the refs/gitblit/tickets branch. + * Creates the refs/meta/gitblit/tickets branch. * @param db */ private void createTicketsBranch(Repository db) { @@ -240,7 +240,7 @@ public class BranchTicketService extends ITicketService implements RefsChangedLi * folder with the remaining characters as a subfolder within that folder. * * @param ticketId - * @return the root path of the ticket content on the refs/gitblit/tickets branch + * @return the root path of the ticket content on the refs/meta/gitblit/tickets branch */ private String toTicketPath(long ticketId) { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java index d3ddc89f..434882f4 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java @@ -520,7 +520,7 @@ public class TicketPage extends TicketBasePage { WicketUtils.setCssClass(votersCount, "badge badge-info");
}
add(votersCount);
- if (user.isAuthenticated) {
+ if (user.isAuthenticated && app().tickets().isAcceptingTicketUpdates(repository)) {
Model<String> model;
if (ticket.isVoter(user.username)) {
model = Model.of(getString("gb.removeVote"));
@@ -560,7 +560,7 @@ public class TicketPage extends TicketBasePage { WicketUtils.setCssClass(watchersCount, "badge badge-info");
}
add(watchersCount);
- if (user.isAuthenticated) {
+ if (user.isAuthenticated && app().tickets().isAcceptingTicketUpdates(repository)) {
Model<String> model;
if (ticket.isWatching(user.username)) {
model = Model.of(getString("gb.stopWatching"));
|