From 6fce727aca709a9940de0f2eac419b4791c3bf9a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 08:06:58 -0400
Subject: [PATCH] Merged #194 "Register BouncyCastle as a JCE provider"
---
src/main/java/com/gitblit/wicket/pages/EditTicketPage.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
index 46781fa..074ffa6 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
@@ -37,6 +37,7 @@
import com.gitblit.Constants;
import com.gitblit.Constants.AccessPermission;
+import com.gitblit.Constants.AuthorizationControl;
import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.TicketModel;
import com.gitblit.models.TicketModel.Change;
@@ -51,6 +52,7 @@
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.MarkdownTextArea;
+import com.google.common.base.Optional;
/**
* Page for editing a ticket.
@@ -133,7 +135,7 @@
form.add(new TextField<String>("title", titleModel));
form.add(new TextField<String>("topic", topicModel));
- final IModel<String> markdownPreviewModel = new Model<String>();
+ final IModel<String> markdownPreviewModel = Model.of(ticket.body == null ? "" : ticket.body);
descriptionPreview = new Label("descriptionPreview", markdownPreviewModel);
descriptionPreview.setEscapeModelStrings(false);
descriptionPreview.setOutputMarkupId(true);
@@ -163,13 +165,14 @@
// responsible
Set<String> userlist = new TreeSet<String>(ticket.getParticipants());
- if (UserModel.ANONYMOUS.canPush(getRepositoryModel())) {
- // anonymous push
+ if (UserModel.ANONYMOUS.canPush(getRepositoryModel())
+ || AuthorizationControl.AUTHENTICATED == getRepositoryModel().authorizationControl) {
+ // authorization is ANONYMOUS or AUTHENTICATED (i.e. all users can be set responsible)
userlist.addAll(app().users().getAllUsernames());
} else {
- // authenticated push
+ // authorization is by NAMED users (users with PUSH permission can be set responsible)
for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {
- if (rp.permission.atLeast(AccessPermission.PUSH) && !rp.isTeam()) {
+ if (rp.permission.atLeast(AccessPermission.PUSH)) {
userlist.add(rp.registrant);
}
}
@@ -266,7 +269,7 @@
change.setField(Field.title, title);
}
- String description = descriptionEditor.getText();
+ String description = Optional.fromNullable(descriptionEditor.getText()).or("");
if ((StringUtils.isEmpty(ticket.body) && !StringUtils.isEmpty(description))
|| (!StringUtils.isEmpty(ticket.body) && !ticket.body.equals(description))) {
// description change
@@ -285,9 +288,9 @@
change.setField(Field.type, type);
}
- String topic = topicModel.getObject();
+ String topic = Optional.fromNullable(topicModel.getObject()).or("");
if ((StringUtils.isEmpty(ticket.topic) && !StringUtils.isEmpty(topic))
- || (!StringUtils.isEmpty(topic) && !topic.equals(ticket.topic))) {
+ || (!StringUtils.isEmpty(ticket.topic) && !ticket.topic.equals(topic))) {
// topic change
change.setField(Field.topic, topic);
}
--
Gitblit v1.9.1