The Unified and Autonomous Development Platform
Ask user to type 'yes' when move/delete all issues
Robin Shenf27bf88da257
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 06c99d6b5f..c4fe6fa762 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -89,6 +89,7 @@ import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.component.orderedit.OrderEditPanel;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;@@ -266,29 +267,42 @@ public abstract class BuildListPanel extends Panel {@Overridepublic String getLabel() {- return "All Queried Builds";+ return "Delete All Queried Builds";}@Overridepublic WebMarkupContainer newLink(String id) {return new AjaxLink<Void>(id) {- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete all queried builds?"));- }-@SuppressWarnings("unchecked")@Overridepublic void onClick(AjaxRequestTarget target) {dropdown.close();- Collection<Build> builds = new ArrayList<>();- for (Iterator<Build> it = (Iterator<Build>) dataProvider.iterator(0, buildsTable.getItemCount()); it.hasNext();) {- builds.add(it.next());- }- OneDev.getInstance(BuildManager.class).delete(builds);- target.add(body);++ new ConfirmModalPanel(target) {++ @Override+ protected void onConfirm(AjaxRequestTarget target) {+ Collection<Build> builds = new ArrayList<>();+ for (Iterator<Build> it = (Iterator<Build>) dataProvider.iterator(0, buildsTable.getItemCount()); it.hasNext();) {+ builds.add(it.next());+ }+ OneDev.getInstance(BuildManager.class).delete(builds);+ target.add(body);+ }++ @Override+ protected String getConfirmMessage() {+ return "Type <code>yes</code> below to delete all queried builds";+ }++ @Override+ protected String getConfirmInput() {+ return "yes";+ }++ };+}@Override@@ -316,7 +330,7 @@ public abstract class BuildListPanel extends Panel {@Overridepublic String getLabel() {- return "Selected Builds";+ return "Delete Selected Builds";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 5d058a62d6..337dd8ee2c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -743,7 +743,7 @@ public abstract class IssueListPanel extends Panel {@Overridepublic String getLabel() {- return "All Queried Issues";+ return "Move All Queried Issues To...";}@Override@@ -786,12 +786,12 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected String getConfirmMessage() {- return "Do you really want to move all queried issues to project '" + getTargetProject().getName() + "'?";+ return "Type <code>yes</code> below to move all queried issues to project '" + getTargetProject().getName() + "'";}@Overrideprotected String getConfirmInput() {- return null;+ return "yes";}};@@ -825,7 +825,7 @@ public abstract class IssueListPanel extends Panel {@Overridepublic String getLabel() {- return "Selected Issues";+ return "Move Selected Issues To...";}@Override@@ -922,29 +922,41 @@ public abstract class IssueListPanel extends Panel {@Overridepublic String getLabel() {- return "All Queried Issues";+ return "Delete All Queried Issues";}@Overridepublic WebMarkupContainer newLink(String id) {return new AjaxLink<Void>(id) {- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete all queried issues?"));- }-@SuppressWarnings("unchecked")@Overridepublic void onClick(AjaxRequestTarget target) {dropdown.close();- Collection<Issue> issues = new ArrayList<>();- for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext();) {- issues.add(it.next());- }- OneDev.getInstance(IssueManager.class).delete(issues);- target.add(body);++ new ConfirmModalPanel(target) {++ @Override+ protected void onConfirm(AjaxRequestTarget target) {+ Collection<Issue> issues = new ArrayList<>();+ for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext();) {+ issues.add(it.next());+ }+ OneDev.getInstance(IssueManager.class).delete(issues);+ target.add(body);+ }++ @Override+ protected String getConfirmMessage() {+ return "Type <code>yes</code> below to delete all queried issues";+ }++ @Override+ protected String getConfirmInput() {+ return "yes";+ }++ };}@Override@@ -972,7 +984,7 @@ public abstract class IssueListPanel extends Panel {@Overridepublic String getLabel() {- return "Selected Issues";+ return "Delete Selected Issues";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java b/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.javaindex 22e04f1fb6..917d52a3ba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java@@ -29,7 +29,7 @@ public abstract class ConfirmDeleteProjectModal extends ConfirmModalPanel {@Overrideprotected String getConfirmMessage() {return "Everything inside this project will be deleted and can not be recovered, "- + "please input project name <i>" + getProject().getName() + "</i> below to confirm deletion.";+ + "please type project name <code>" + getProject().getName() + "</code> below to confirm deletion.";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 2277461867..8c4658e560 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -78,6 +78,7 @@ import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.component.orderedit.OrderEditPanel;import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;import io.onedev.server.web.component.project.selector.ProjectSelector;@@ -250,29 +251,42 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic String getLabel() {- return "All Queried Pull Requests";+ return "Delete All Queried Pull Requests";}@Overridepublic WebMarkupContainer newLink(String id) {return new AjaxLink<Void>(id) {- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete all queried pull requests?"));- }-@SuppressWarnings("unchecked")@Overridepublic void onClick(AjaxRequestTarget target) {dropdown.close();- Collection<PullRequest> requests = new ArrayList<>();- for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext();) {- requests.add(it.next());- }- OneDev.getInstance(PullRequestManager.class).delete(requests);- target.add(body);++ new ConfirmModalPanel(target) {++ @Override+ protected void onConfirm(AjaxRequestTarget target) {+ Collection<PullRequest> requests = new ArrayList<>();+ for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext();) {+ requests.add(it.next());+ }+ OneDev.getInstance(PullRequestManager.class).delete(requests);+ target.add(body);+ }++ @Override+ protected String getConfirmMessage() {+ return "Type <code>yes</code> below to delete all queried pull requests";+ }++ @Override+ protected String getConfirmInput() {+ return "yes";+ }++ };+}@Override@@ -300,7 +314,7 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic String getLabel() {- return "Selected Pull Requests";+ return "Delete Selected Pull Requests";}@Override