Kaynağa Gözat

Add confirm milestone deletion prompt

tags/v1.6.0
James Moger 10 yıl önce
ebeveyn
işleme
db040113c4

+ 2
- 0
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties Dosyayı Görüntüle

@@ -676,6 +676,8 @@ gb.myTickets = my tickets
gb.yourAssignedTickets = assigned to you
gb.newMilestone = new milestone
gb.editMilestone = edit milestone
gb.deleteMilestone = Delete milestone \"{0}\"?
gb.milestoneDeleteFailed = Failed to delete milestone ''{0}''!
gb.notifyChangedOpenTickets = send notification for changed open tickets
gb.overdue = overdue
gb.openMilestones = open milestones

+ 11
- 4
src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java Dosyayı Görüntüle

@@ -15,6 +15,7 @@
*/
package com.gitblit.wicket.pages;
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -30,6 +31,7 @@ import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -41,6 +43,7 @@ import com.gitblit.tickets.TicketMilestone;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation;
/**
* Page for creating a new milestone.
@@ -157,11 +160,12 @@ public class EditMilestonePage extends RepositoryPage {
cancel.setDefaultFormProcessing(false);
form.add(cancel);
Button delete = new Button("delete") {
Link<Void> delete = new Link<Void>("delete") {
private static final long serialVersionUID = 1L;
@Override
public void onSubmit() {
public void onClick() {
UserModel currentUser = GitBlitWebSession.get().getUser();
String createdBy = currentUser.username;
boolean notify = notificationModel.getObject();
@@ -169,11 +173,14 @@ public class EditMilestonePage extends RepositoryPage {
if (app().tickets().deleteMilestone(getRepositoryModel(), oldName, createdBy, notify)) {
setResponsePage(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));
} else {
// TODO error processing
error(MessageFormat.format(getString("gb.milestoneDeleteFailed"), oldName));
}
}
};
delete.setDefaultFormProcessing(false);
delete.add(new JavascriptEventConfirmation("onclick", MessageFormat.format(
getString("gb.deleteMilestone"), oldName)));
form.add(delete);
}

Loading…
İptal
Kaydet