From e37a8e40ee0e6066056563c065d6b55a4a1200ad Mon Sep 17 00:00:00 2001
From: Jeroen Baten <jeroen@jeroenbaten.nl>
Date: Sun, 09 Mar 2014 03:57:35 -0400
Subject: [PATCH] dutch translation of string
---
src/main/java/com/gitblit/wicket/pages/TicketPage.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index d3ddc89..1a1686d 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 @@
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 @@
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"));
@@ -988,7 +988,7 @@
md = md.replace("${ticketId}", "" + ticketId);
md = md.replace("${patchset}", "" + 1);
md = md.replace("${reviewBranch}", Repository.shortenRefName(PatchsetCommand.getTicketBranch(ticketId)));
- String integrationBranch = Repository.shortenRefName(getRepositoryModel().HEAD);
+ String integrationBranch = Repository.shortenRefName(getRepositoryModel().mergeTo);
if (!StringUtils.isEmpty(ticket.mergeTo)) {
integrationBranch = ticket.mergeTo;
}
--
Gitblit v1.9.1