From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
src/main/java/com/gitblit/wicket/pages/EditTicketPage.java | 241 ++++++++++++++++++++++++++++--------------------
1 files changed, 140 insertions(+), 101 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
index aad1d6f..c3294ba 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
@@ -23,6 +23,8 @@
import java.util.TreeSet;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -72,6 +74,8 @@
private IModel<String> mergeToModel;
+ private IModel<Status> statusModel;
+
private IModel<TicketResponsible> responsibleModel;
private IModel<TicketMilestone> milestoneModel;
@@ -86,11 +90,6 @@
currentUser = UserModel.ANONYMOUS;
}
- if (!currentUser.isAuthenticated || !app().tickets().isAcceptingTicketUpdates(getRepositoryModel())) {
- // tickets prohibited
- setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName));
- }
-
long ticketId = 0L;
try {
String h = WicketUtils.getObject(params);
@@ -100,8 +99,13 @@
}
TicketModel ticket = app().tickets().getTicket(getRepositoryModel(), ticketId);
- if (ticket == null) {
- setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName));
+ if (ticket == null
+ || !currentUser.canEdit(ticket, getRepositoryModel())
+ || !app().tickets().isAcceptingTicketUpdates(getRepositoryModel())) {
+ setResponsePage(TicketsPage.class, WicketUtils.newObjectParameter(repositoryName, "" + ticketId));
+
+ // create a placeholder object so we don't trigger NPEs
+ ticket = new TicketModel();
}
typeModel = Model.of(ticket.type);
@@ -109,17 +113,130 @@
topicModel = Model.of(ticket.topic == null ? "" : ticket.topic);
responsibleModel = Model.of();
milestoneModel = Model.of();
- mergeToModel = Model.of(ticket.mergeTo == null ? "" : ticket.mergeTo);
+ mergeToModel = Model.of(ticket.mergeTo == null ? getRepositoryModel().mergeTo : ticket.mergeTo);
+ statusModel = Model.of(ticket.status);
setStatelessHint(false);
setOutputMarkupId(true);
- Form<Void> form = new Form<Void>("editForm") {
+ Form<Void> form = new Form<Void>("editForm");
+ add(form);
+
+ List<Type> typeChoices;
+ if (ticket.isProposal()) {
+ typeChoices = Arrays.asList(Type.Proposal);
+ } else {
+ typeChoices = Arrays.asList(TicketModel.Type.choices());
+ }
+ form.add(new DropDownChoice<TicketModel.Type>("type", typeModel, typeChoices));
+
+ form.add(new TextField<String>("title", titleModel));
+ form.add(new TextField<String>("topic", topicModel));
+
+ final IModel<String> markdownPreviewModel = new Model<String>();
+ descriptionPreview = new Label("descriptionPreview", markdownPreviewModel);
+ descriptionPreview.setEscapeModelStrings(false);
+ descriptionPreview.setOutputMarkupId(true);
+ form.add(descriptionPreview);
+
+ descriptionEditor = new MarkdownTextArea("description", markdownPreviewModel, descriptionPreview);
+ descriptionEditor.setRepository(repositoryName);
+ descriptionEditor.setText(ticket.body);
+ form.add(descriptionEditor);
+
+ // status
+ List<Status> statusChoices;
+ if (ticket.isClosed()) {
+ statusChoices = Arrays.asList(ticket.status, Status.Open);
+ } else if (ticket.isProposal()) {
+ statusChoices = Arrays.asList(TicketModel.Status.proposalWorkflow);
+ } else if (ticket.isBug()) {
+ statusChoices = Arrays.asList(TicketModel.Status.bugWorkflow);
+ } else {
+ statusChoices = Arrays.asList(TicketModel.Status.requestWorkflow);
+ }
+ Fragment status = new Fragment("status", "statusFragment", this);
+ status.add(new DropDownChoice<TicketModel.Status>("status", statusModel, statusChoices));
+ form.add(status);
+
+ if (currentUser.canAdmin(ticket, getRepositoryModel())) {
+ // responsible
+ Set<String> userlist = new TreeSet<String>(ticket.getParticipants());
+
+ for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {
+ if (rp.permission.atLeast(AccessPermission.PUSH) && !rp.isTeam()) {
+ userlist.add(rp.registrant);
+ }
+ }
+
+ List<TicketResponsible> responsibles = new ArrayList<TicketResponsible>();
+ for (String username : userlist) {
+ UserModel user = app().users().getUserModel(username);
+ if (user != null) {
+ TicketResponsible responsible = new TicketResponsible(user);
+ responsibles.add(responsible);
+ if (user.username.equals(ticket.responsible)) {
+ responsibleModel.setObject(responsible);
+ }
+ }
+ }
+ Collections.sort(responsibles);
+ responsibles.add(new TicketResponsible(NIL, "", ""));
+ Fragment responsible = new Fragment("responsible", "responsibleFragment", this);
+ responsible.add(new DropDownChoice<TicketResponsible>("responsible", responsibleModel, responsibles));
+ form.add(responsible.setVisible(!responsibles.isEmpty()));
+
+ // milestone
+ List<TicketMilestone> milestones = app().tickets().getMilestones(getRepositoryModel(), Status.Open);
+ for (TicketMilestone milestone : milestones) {
+ if (milestone.name.equals(ticket.milestone)) {
+ milestoneModel.setObject(milestone);
+ break;
+ }
+ }
+ if (milestoneModel.getObject() == null && !StringUtils.isEmpty(ticket.milestone)) {
+ // ensure that this unrecognized milestone is listed
+ // so that we get the <nil> selection.
+ TicketMilestone tms = new TicketMilestone(ticket.milestone);
+ milestones.add(tms);
+ milestoneModel.setObject(tms);
+ }
+ if (!milestones.isEmpty()) {
+ milestones.add(new TicketMilestone(NIL));
+ }
+
+ Fragment milestone = new Fragment("milestone", "milestoneFragment", this);
+
+ milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));
+ form.add(milestone.setVisible(!milestones.isEmpty()));
+
+ // mergeTo (integration branch)
+ List<String> branches = new ArrayList<String>();
+ for (String branch : getRepositoryModel().getLocalBranches()) {
+ // exclude ticket branches
+ if (!branch.startsWith(Constants.R_TICKET)) {
+ branches.add(Repository.shortenRefName(branch));
+ }
+ }
+ branches.remove(Repository.shortenRefName(getRepositoryModel().mergeTo));
+ branches.add(0, Repository.shortenRefName(getRepositoryModel().mergeTo));
+
+ Fragment mergeto = new Fragment("mergeto", "mergeToFragment", this);
+ mergeto.add(new DropDownChoice<String>("mergeto", mergeToModel, branches));
+ form.add(mergeto.setVisible(!branches.isEmpty()));
+ } else {
+ // user can not admin this ticket
+ form.add(new Label("responsible").setVisible(false));
+ form.add(new Label("milestone").setVisible(false));
+ form.add(new Label("mergeto").setVisible(false));
+ }
+
+ form.add(new AjaxButton("update") {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit() {
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
long ticketId = 0L;
try {
String h = WicketUtils.getObject(getPageParameters());
@@ -134,15 +251,26 @@
Change change = new Change(createdBy);
String title = titleModel.getObject();
+ if (StringUtils.isEmpty(title)) {
+ return;
+ }
+
if (!ticket.title.equals(title)) {
// title change
change.setField(Field.title, title);
}
String description = descriptionEditor.getText();
- if (!ticket.body.equals(description)) {
+ if ((StringUtils.isEmpty(ticket.body) && !StringUtils.isEmpty(description))
+ || (!StringUtils.isEmpty(ticket.body) && !ticket.body.equals(description))) {
// description change
change.setField(Field.body, description);
+ }
+
+ Status status = statusModel.getObject();
+ if (!ticket.status.equals(status)) {
+ // status change
+ change.setField(Field.status, status);
}
Type type = typeModel.getObject();
@@ -203,97 +331,8 @@
setResponsePage(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
}
}
- };
- add(form);
+ });
- List<Type> typeChoices;
- if (ticket.isProposal()) {
- typeChoices = Arrays.asList(Type.Proposal);
- } else {
- typeChoices = Arrays.asList(TicketModel.Type.choices());
- }
- form.add(new DropDownChoice<TicketModel.Type>("type", typeModel, typeChoices));
- form.add(new TextField<String>("title", titleModel));
- form.add(new TextField<String>("topic", topicModel));
-
- final IModel<String> markdownPreviewModel = new Model<String>();
- descriptionPreview = new Label("descriptionPreview", markdownPreviewModel);
- descriptionPreview.setEscapeModelStrings(false);
- descriptionPreview.setOutputMarkupId(true);
- form.add(descriptionPreview);
-
- descriptionEditor = new MarkdownTextArea("description", markdownPreviewModel, descriptionPreview);
- descriptionEditor.setRepository(repositoryName);
- descriptionEditor.setText(ticket.body);
- form.add(descriptionEditor);
-
- if (currentUser != null && currentUser.isAuthenticated && currentUser.canPush(getRepositoryModel())) {
- // responsible
- Set<String> userlist = new TreeSet<String>(ticket.getParticipants());
-
- for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {
- if (rp.permission.atLeast(AccessPermission.PUSH) && !rp.isTeam()) {
- userlist.add(rp.registrant);
- }
- }
-
- List<TicketResponsible> responsibles = new ArrayList<TicketResponsible>();
- for (String username : userlist) {
- UserModel user = app().users().getUserModel(username);
- if (user != null) {
- TicketResponsible responsible = new TicketResponsible(user);
- responsibles.add(responsible);
- if (user.username.equals(ticket.responsible)) {
- responsibleModel.setObject(responsible);
- }
- }
- }
- Collections.sort(responsibles);
- responsibles.add(new TicketResponsible(NIL, "", ""));
- Fragment responsible = new Fragment("responsible", "responsibleFragment", this);
- responsible.add(new DropDownChoice<TicketResponsible>("responsible", responsibleModel, responsibles));
- form.add(responsible.setVisible(!responsibles.isEmpty()));
-
- // milestone
- List<TicketMilestone> milestones = app().tickets().getMilestones(getRepositoryModel(), Status.Open);
- for (TicketMilestone milestone : milestones) {
- if (milestone.name.equals(ticket.milestone)) {
- milestoneModel.setObject(milestone);
- break;
- }
- }
- if (!milestones.isEmpty()) {
- milestones.add(new TicketMilestone(NIL));
- }
-
- Fragment milestone = new Fragment("milestone", "milestoneFragment", this);
-
- milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));
- form.add(milestone.setVisible(!milestones.isEmpty()));
-
- // mergeTo (integration branch)
- List<String> branches = new ArrayList<String>();
- for (String branch : getRepositoryModel().getLocalBranches()) {
- // exclude ticket branches
- if (!branch.startsWith(Constants.R_TICKET)) {
- branches.add(Repository.shortenRefName(branch));
- }
- }
- branches.remove(Repository.shortenRefName(getRepositoryModel().HEAD));
- branches.add(0, Repository.shortenRefName(getRepositoryModel().HEAD));
-
- Fragment mergeto = new Fragment("mergeto", "mergeToFragment", this);
- mergeto.add(new DropDownChoice<String>("mergeto", mergeToModel, branches));
- form.add(mergeto.setVisible(!branches.isEmpty()));
-
- } else {
- // user does not have permission to assign milestone or responsible
- form.add(new Label("responsible").setVisible(false));
- form.add(new Label("milestone").setVisible(false));
- form.add(new Label("mergeto").setVisible(false));
- }
-
- form.add(new Button("update"));
Button cancel = new Button("cancel") {
private static final long serialVersionUID = 1L;
--
Gitblit v1.9.1