From 077d23176a8f098766bf492081ae5ab9acb2d285 Mon Sep 17 00:00:00 2001
From: Carsten Lenz <clenz2@csc.com>
Date: Fri, 13 Jun 2014 08:26:23 -0400
Subject: [PATCH] Add german translation of welcome.mkd
---
src/main/java/com/gitblit/wicket/pages/NewTicketPage.java | 139 ++++++++++++++++++++++++++++++---------------
1 files changed, 92 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java b/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
index 17ad1d1..961590a 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
@@ -21,6 +21,8 @@
import java.util.List;
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;
@@ -29,7 +31,9 @@
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.eclipse.jgit.lib.Repository;
+import com.gitblit.Constants;
import com.gitblit.Constants.AccessPermission;
import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.TicketModel;
@@ -61,6 +65,8 @@
private IModel<String> topicModel;
+ private IModel<String> mergeToModel;
+
private IModel<TicketResponsible> responsibleModel;
private IModel<TicketMilestone> milestoneModel;
@@ -83,21 +89,97 @@
typeModel = Model.of(TicketModel.Type.defaultType);
titleModel = Model.of();
topicModel = Model.of();
+ mergeToModel = Model.of(Repository.shortenRefName(getRepositoryModel().mergeTo));
responsibleModel = Model.of();
milestoneModel = Model.of();
setStatelessHint(false);
setOutputMarkupId(true);
- Form<Void> form = new Form<Void>("editForm") {
+ Form<Void> form = new Form<Void>("editForm");
+ add(form);
+
+ form.add(new DropDownChoice<TicketModel.Type>("type", typeModel, Arrays.asList(TicketModel.Type.choices())));
+ 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);
+ form.add(descriptionEditor);
+
+ if (currentUser.canAdmin(null, getRepositoryModel())) {
+ // responsible
+ List<TicketResponsible> responsibles = new ArrayList<TicketResponsible>();
+ if (UserModel.ANONYMOUS.canPush(getRepositoryModel())) {
+ // anonymous push allowed
+ for (UserModel user : app().users().getAllUsers()) {
+ if (!user.disabled) {
+ responsibles.add(new TicketResponsible(user));
+ }
+ }
+ } else {
+ // authenticated push
+ for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {
+ if (rp.permission.atLeast(AccessPermission.PUSH) && !rp.isTeam()) {
+ UserModel user = app().users().getUserModel(rp.registrant);
+ if (user != null && !user.disabled) {
+ responsibles.add(new TicketResponsible(user));
+ }
+ }
+ }
+ }
+ Collections.sort(responsibles);
+ 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);
+ Fragment milestone = new Fragment("milestone", "milestoneFragment", this);
+ milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));
+ form.add(milestone.setVisible(!milestones.isEmpty()));
+
+ // 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, responsible, or mergeto
+ 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("create") {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit() {
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ String title = titleModel.getObject();
+ if (StringUtils.isEmpty(title)) {
+ return;
+ }
+
String createdBy = GitBlitWebSession.get().getUsername();
Change change = new Change(createdBy);
- change.setField(Field.title, titleModel.getObject());
+ change.setField(Field.title, title);
change.setField(Field.body, descriptionEditor.getText());
String topic = topicModel.getObject();
if (!StringUtils.isEmpty(topic)) {
@@ -123,6 +205,12 @@
change.setField(Field.milestone, milestone.name);
}
+ // integration branch
+ String mergeTo = mergeToModel.getObject();
+ if (!StringUtils.isEmpty(mergeTo)) {
+ change.setField(Field.mergeTo, mergeTo);
+ }
+
TicketModel ticket = app().tickets().createTicket(getRepositoryModel(), 0L, change);
if (ticket != null) {
TicketNotifier notifier = app().tickets().createNotifier();
@@ -132,51 +220,8 @@
// TODO error
}
}
- };
- add(form);
+ });
- form.add(new DropDownChoice<TicketModel.Type>("type", typeModel, Arrays.asList(TicketModel.Type.choices())));
- 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);
- form.add(descriptionEditor);
-
- if (currentUser != null && currentUser.isAuthenticated && currentUser.canPush(getRepositoryModel())) {
- // responsible
- List<TicketResponsible> responsibles = new ArrayList<TicketResponsible>();
- for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {
- if (rp.permission.atLeast(AccessPermission.PUSH) && !rp.isTeam()) {
- UserModel user = app().users().getUserModel(rp.registrant);
- if (user != null) {
- responsibles.add(new TicketResponsible(user));
- }
- }
- }
- Collections.sort(responsibles);
- 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);
- Fragment milestone = new Fragment("milestone", "milestoneFragment", this);
- milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));
- form.add(milestone.setVisible(!milestones.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 Button("create"));
Button cancel = new Button("cancel") {
private static final long serialVersionUID = 1L;
--
Gitblit v1.9.1