The Unified and Autonomous Development Platform
Show forks of project. Show owned projects upon deleting user.
Robin Shen7192f8939ad1
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 a443da2566..82afcdb403 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@@ -80,7 +80,7 @@ public abstract class BuildListPanel extends Panel {private final String query;- private final Integer expectedCount;+ private final int expectedCount;private IModel<BuildQuery> parsedQueryModel = new LoadableDetachableModel<BuildQuery>() {@@ -107,7 +107,7 @@ public abstract class BuildListPanel extends Panel {private DataTable<Build, Void> buildsTable;- public BuildListPanel(String id, @Nullable String query, @Nullable Integer expectedCount) {+ public BuildListPanel(String id, @Nullable String query, int expectedCount) {super(id);this.query = query;this.expectedCount = expectedCount;@@ -281,7 +281,7 @@ public abstract class BuildListPanel extends Panel {};- if (expectedCount != null && expectedCount != dataProvider.size())+ if (expectedCount != 0 && expectedCount != dataProvider.size())warn("Some builds might be hidden due to permission policy");body.add(new NotificationPanel("feedback", this));diff --git a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.css b/server-core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.cssdeleted file mode 100644index 88cd655e99..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.css+++ /dev/null@@ -1,6 +0,0 @@-.confirm-action .feedbackPanel {- margin-top: 16px;-}-.confirm-action input.confirm {- margin-top: 16px;-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/link/LabelLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/LabelLink.javadeleted file mode 100644index f00c7111b6..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/link/LabelLink.java+++ /dev/null@@ -1,31 +0,0 @@-package io.onedev.server.web.component.link;--import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.IModel;--@SuppressWarnings("serial")-public abstract class LabelLink<T> extends Link<T> {-- private final IModel<String> labelModel;-- public LabelLink(String id, IModel<String> labelModel) {- this(id, null, labelModel);- }-- public LabelLink(String id, IModel<T> linkModel, IModel<String> labelModel) {- super(id, linkModel);- this.labelModel = labelModel;- }-- @Override- public IModel<?> getBody() {- return labelModel;- }-- @Override- public void onDetach() {- labelModel.detach();-- super.onDetach();- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionModal.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModal.javasimilarity index 67%rename from server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionModal.javarename to server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModal.javaindex bb871b936f..ffde11ff35 100644--- a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionModal.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModal.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.confirmaction;+package io.onedev.server.web.component.modal.confirm;import javax.annotation.Nullable;@@ -8,19 +8,19 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import io.onedev.server.web.component.modal.ModalPanel;@SuppressWarnings("serial")-public abstract class ConfirmActionModal extends ModalPanel {+public abstract class ConfirmModal extends ModalPanel {- public ConfirmActionModal(AjaxRequestTarget target) {+ public ConfirmModal(AjaxRequestTarget target) {super(target);}@Overrideprotected Component newContent(String id) {- return new ConfirmActionPanel(id) {+ return new ConfirmPanel(id) {@Overrideprotected void onConfirm(AjaxRequestTarget target) {- ConfirmActionModal.this.onConfirm(target);+ ConfirmModal.this.onConfirm(target);close();}@@ -31,12 +31,12 @@ public abstract class ConfirmActionModal extends ModalPanel {@Overrideprotected String getConfirmMessage() {- return ConfirmActionModal.this.getConfirmMessage();+ return ConfirmModal.this.getConfirmMessage();}@Overrideprotected String getConfirmInput() {- return ConfirmActionModal.this.getConfirmInput();+ return ConfirmModal.this.getConfirmInput();}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.htmlsimilarity index 81%rename from server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.htmlindex c47fc0b5cd..a8f187757a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.html@@ -1,6 +1,5 @@<wicket:panel>- <div class="confirm-action">- <!-- Add form tag so that the default delete button can be triggered when user hits return -->+ <div class="confirm"><form><div class="modal-header"><button wicket:id="close" type="button" class="close">×</button>diff --git a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.javaindex a0f8f93735..e971c5c613 100644--- a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.confirmaction;+package io.onedev.server.web.component.modal.confirm;import javax.annotation.Nullable;@@ -18,9 +18,9 @@ import io.onedev.server.OneException;import io.onedev.server.web.component.link.PreventDefaultAjaxLink;@SuppressWarnings("serial")-abstract class ConfirmActionPanel extends Panel {+abstract class ConfirmPanel extends Panel {- public ConfirmActionPanel(String id) {+ public ConfirmPanel(String id) {super(id);}@@ -57,7 +57,7 @@ abstract class ConfirmActionPanel extends Panel {onConfirm(target);} catch (OneException e) {error(e.getMessage());- target.add(ConfirmActionPanel.this);+ target.add(ConfirmPanel.this);}}@@ -78,9 +78,9 @@ abstract class ConfirmActionPanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new ConfirmActionResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new ConfirmResourceReference()));- String script = String.format("onedev.server.confirmAction('%s', %s);",+ String script = String.format("onedev.server.confirm('%s', %s);",getMarkupId(), getConfirmInput()!=null?"'" + JavaScriptEscape.escapeJavaScript(getConfirmInput()) + "'": "undefined");response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmResourceReference.javasimilarity index 62%rename from server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmResourceReference.javaindex 26bbc9d6b1..bc81cdd63f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.confirmaction;+package io.onedev.server.web.component.modal.confirm;import java.util.List;@@ -8,18 +8,18 @@ import org.apache.wicket.request.resource.CssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;-public class ConfirmActionResourceReference extends BaseDependentResourceReference {+public class ConfirmResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public ConfirmActionResourceReference() {- super(ConfirmActionResourceReference.class, "confirm-action.js");+ public ConfirmResourceReference() {+ super(ConfirmResourceReference.class, "confirm.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(ConfirmActionResourceReference.class, "confirm-action.css")));+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(ConfirmResourceReference.class, "confirm.css")));return dependencies;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/confirm.css b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/confirm.cssnew file mode 100644index 0000000000..47bef5d61b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/confirm.css@@ -0,0 +1,6 @@+.confirm .feedbackPanel {+ margin-top: 16px;+}+.confirm input.confirm {+ margin-top: 16px;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.js b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/confirm.jssimilarity index 84%rename from server-core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.jsrename to server-core/src/main/java/io/onedev/server/web/component/modal/confirm/confirm.jsindex e8f75f9c66..0499025bf6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.js+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/confirm.js@@ -1,4 +1,4 @@-onedev.server.confirmAction = function(containerId, confirmInput) {+onedev.server.confirm = function(containerId, confirmInput) {var $container = $("#" + containerId);var $confirmBtn = $container.find(".btn-danger, .btn-primary");if (confirmInput) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessageCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessageCssResourceReference.javanew file mode 100644index 0000000000..f45a0aa91a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessageCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.modal.message;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class MessageCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public MessageCssResourceReference() {+ super(MessageCssResourceReference.class, "message.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessageModal.java b/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessageModal.javanew file mode 100644index 0000000000..8dcc33942a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessageModal.java@@ -0,0 +1,34 @@+package io.onedev.server.web.component.modal.message;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;++import io.onedev.server.web.component.modal.ModalPanel;++@SuppressWarnings("serial")+public abstract class MessageModal extends ModalPanel {++ public MessageModal(AjaxRequestTarget target) {+ super(target);+ }++ @Override+ protected Component newContent(String id) {+ return new MessagePanel(id) {++ @Override+ protected Component newMessageContent(String componentId) {+ return MessageModal.this.newMessageContent(componentId);+ }++ @Override+ protected void close(AjaxRequestTarget target) {+ MessageModal.this.close();+ }++ };+ }++ protected abstract Component newMessageContent(String componentId);++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessagePanel.html b/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessagePanel.htmlnew file mode 100644index 0000000000..ed129d4ae8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessagePanel.html@@ -0,0 +1,14 @@+<wicket:panel>+ <div class="message">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 class="modal-title">Please Note</h4>+ </div>+ <div class="modal-body">+ <div wicket:id="content" class="content"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="ok" type="submit" class="btn btn-primary" value="Ok">+ </div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessagePanel.java b/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessagePanel.javanew file mode 100644index 0000000000..9090092581--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessagePanel.java@@ -0,0 +1,53 @@+package io.onedev.server.web.component.modal.message;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.panel.Panel;++import io.onedev.server.web.component.link.PreventDefaultAjaxLink;++@SuppressWarnings("serial")+abstract class MessagePanel extends Panel {++ public MessagePanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close(target);+ }++ });++ add(newMessageContent("content"));++ add(new PreventDefaultAjaxLink<Void>("ok") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close(target);+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new MessageCssResourceReference()));+ }++ protected abstract Component newMessageContent(String componentId);++ protected abstract void close(AjaxRequestTarget target);+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/message/message.css b/server-core/src/main/java/io/onedev/server/web/component/modal/message/message.cssnew file mode 100644index 0000000000..28a77d1b64--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/message/message.css@@ -0,0 +1,3 @@+.message .modal-footer {+ text-align: center;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js b/server-core/src/main/java/io/onedev/server/web/component/modal/modal.jsindex 3de700f637..cc51262de6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js@@ -25,6 +25,8 @@ onedev.server.modal = {$(document).on("keydown", $modal.data("keydown"));$modal.modal({backdrop: "static", "keyboard": false});++ $(document.activeElement).blur();},close: function($modal, callCloseCallback) {diff --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 632b011728..1bb8c516e5 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@@ -5,10 +5,10 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;-import io.onedev.server.web.component.confirmaction.ConfirmActionModal;+import io.onedev.server.web.component.modal.confirm.ConfirmModal;@SuppressWarnings("serial")-public abstract class ConfirmDeleteProjectModal extends ConfirmActionModal {+public abstract class ConfirmDeleteProjectModal extends ConfirmModal {public ConfirmDeleteProjectModal(AjaxRequestTarget target) {super(target);diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex c390813223..11a9ee6c5a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -68,7 +68,7 @@ public class ProjectListPanel extends Panel {private final String query;- private final Integer expectedCount;+ private final int expectedCount;private IModel<ProjectQuery> parsedQueryModel = new LoadableDetachableModel<ProjectQuery>() {@@ -89,7 +89,7 @@ public class ProjectListPanel extends Panel {};- public ProjectListPanel(String id, @Nullable String query, @Nullable Integer expectedCount) {+ public ProjectListPanel(String id, @Nullable String query, int expectedCount) {super(id);this.query = query;this.expectedCount = expectedCount;@@ -245,7 +245,7 @@ public class ProjectListPanel extends Panel {};- if (expectedCount != null && expectedCount != dataProvider.size())+ if (expectedCount != 0 && expectedCount != dataProvider.size())warn("Some projects might be hidden due to permission policy");body.add(new NotificationPanel("feedback", this));diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.javanew file mode 100644index 0000000000..b18c6c490e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java@@ -0,0 +1,78 @@+package io.onedev.server.web.component.user;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.search.entity.project.ProjectQuery;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.component.modal.confirm.ConfirmModal;+import io.onedev.server.web.component.modal.message.MessageModal;+import io.onedev.server.web.page.project.ProjectListPage;++@SuppressWarnings("serial")+public abstract class UserDeleteLink extends AjaxLink<Void> {++ public UserDeleteLink(String id) {+ super(id);+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (!getUser().getProjects().isEmpty()) {+ new MessageModal(target) {++ @Override+ protected Component newMessageContent(String componentId) {+ String quotedName = ProjectQuery.quote(getUser().getName());+ PageParameters params = ProjectListPage.paramsOf("\"Owner\" is " + quotedName, 0, 0);+ String url = RequestCycle.get().urlFor(ProjectListPage.class, params).toString();+ String html = String.format("There are <a href='%s'>projects owned by this user</a>. "+ + "Please change owner of these projects to be under other users, or delete "+ + "them if no longer needed", url);+ return new Label(componentId, html).setEscapeModelStrings(false);+ }++ };+ } else {+ new ConfirmModal(target) {++ @Override+ protected void onConfirm(AjaxRequestTarget target) {+ OneDev.getInstance(UserManager.class).delete(getUser());+ onDeleted(target);+ }++ @Override+ protected String getConfirmInput() {+ return null;+ }++ @Override+ protected String getConfirmMessage() {+ return "Do you really want to delete user '" + getUser().getDisplayName() + "'?";+ }++ };+ }+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator()+ && !getUser().isRoot()+ && !getUser().equals(SecurityUtils.getUser()));+ }++ protected abstract User getUser();++ protected abstract void onDeleted(AjaxRequestTarget target);++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.javaindex 67410652c4..2a73732dca 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java@@ -3,26 +3,23 @@ package io.onedev.server.web.component.user.profileedit;import java.io.Serializable;import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import com.google.common.collect.Sets;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;-import io.onedev.server.OneException;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.component.user.UserDeleteLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.page.admin.user.UserListPage;-import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")public class ProfileEditPanel extends GenericPanel<User> {@@ -93,26 +90,19 @@ public class ProfileEditPanel extends GenericPanel<User> {form.add(new FencedFeedbackPanel("feedback", form).setEscapeModelStrings(false));- form.add(new Link<Void>("delete") {+ form.add(new UserDeleteLink("delete") {@Override- protected void onConfigure() {- super.onConfigure();-- setVisible(!getUser().equals(SecurityUtils.getUser()));+ protected User getUser() {+ return ProfileEditPanel.this.getUser();}@Override- public void onClick() {- try {- OneDev.getInstance(UserManager.class).delete(getUser());- setResponsePage(UserListPage.class);- } catch (OneException e) {- error(HtmlUtils.formatAsHtml(e.getMessage()));- }+ protected void onDeleted(AjaxRequestTarget target) {+ setResponsePage(UserListPage.class);}-- }.add(new ConfirmOnClick("Do you really want to delete user '" + getUser().getDisplayName() + "'?")));++ });add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.javaindex 8c7e59b474..ebcabdc00f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java@@ -37,7 +37,6 @@ import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;-import io.onedev.server.web.component.link.LabelLink;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.PagingHistorySupport;@@ -109,7 +108,12 @@ public class GroupListPage extends AdministrationPage {@Overridepublic void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId, IModel<Group> rowModel) {Fragment fragment = new Fragment(componentId, "nameFrag", GroupListPage.this);- fragment.add(new LabelLink<Void>("name", Model.of(rowModel.getObject().getName())) {+ fragment.add(new Link<Void>("name") {++ @Override+ public IModel<?> getBody() {+ return Model.of(rowModel.getObject().getName());+ }@Overridepublic void onClick() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.javaindex 26c072ff50..58ab6ff7fa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java@@ -36,7 +36,6 @@ import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;-import io.onedev.server.web.component.link.LabelLink;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.PagingHistorySupport;@@ -108,7 +107,12 @@ public class RoleListPage extends AdministrationPage {@Overridepublic void populateItem(Item<ICellPopulator<Role>> cellItem, String componentId, IModel<Role> rowModel) {Fragment fragment = new Fragment(componentId, "nameFrag", RoleListPage.this);- fragment.add(new LabelLink<Void>("name", Model.of(rowModel.getObject().getName())) {+ fragment.add(new Link<Void>("name") {++ @Override+ public IModel<?> getBody() {+ return Model.of(rowModel.getObject().getName());+ }@Overridepublic void onClick() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.javaindex 32cf004f78..e3ac2ee473 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java@@ -28,9 +28,7 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;-import io.onedev.server.OneException;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;@@ -40,9 +38,9 @@ import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;+import io.onedev.server.web.component.user.UserDeleteLink;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.AdministrationPage;-import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")@@ -150,28 +148,19 @@ public class UserListPage extends AdministrationPage {public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId, IModel<User> rowModel) {Fragment fragment = new Fragment(componentId, "actionFrag", UserListPage.this);- User user = rowModel.getObject();-- fragment.add(new Link<Void>("delete") {+ fragment.add(new UserDeleteLink("delete") {@Override- public void onClick() {- try {- OneDev.getInstance(UserManager.class).delete(rowModel.getObject());- setResponsePage(UserListPage.class);- } catch (OneException e) {- getPage().error(HtmlUtils.formatAsHtml(e.getMessage()));- }+ protected User getUser() {+ return rowModel.getObject();}@Override- protected void onConfigure() {- super.onConfigure();- User user = rowModel.getObject();- setVisible(SecurityUtils.isAdministrator() && !user.isRoot() && !user.equals(getLoginUser()));+ protected void onDeleted(AjaxRequestTarget target) {+ setResponsePage(UserListPage.class, getPageParameters());}-- }.add(new ConfirmOnClick("Do you really want to delete user '" + user.getDisplayName() + "'?")));++ });cellItem.add(fragment);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.javaindex e3e558b554..6fbdaf8168 100644--- a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java@@ -42,7 +42,7 @@ public class BuildListPage extends LayoutPage {private static final String PARAM_EXPECTED_COUNT = "expectedCount";- private Integer expectedCount;+ private int expectedCount;private final IModel<String> queryModel = new LoadableDetachableModel<String>() {@@ -75,7 +75,7 @@ public class BuildListPage extends LayoutPage {public BuildListPage(PageParameters params) {super(params);- expectedCount = params.get(PARAM_EXPECTED_COUNT).toOptionalInteger();+ expectedCount = params.get(PARAM_EXPECTED_COUNT).toInt(0);}protected GlobalBuildSetting getBuildSetting() {@@ -108,7 +108,7 @@ public class BuildListPage extends LayoutPage {@Overrideprotected Link<Void> newQueryLink(String componentId, NamedBuildQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, BuildListPage.class,- BuildListPage.paramsOf(namedQuery.getQuery(), 0, null));+ BuildListPage.paramsOf(namedQuery.getQuery(), 0, 0));}@Override@@ -146,7 +146,7 @@ public class BuildListPage extends LayoutPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(queryModel.getObject(), 0, null);+ PageParameters params = paramsOf(queryModel.getObject(), 0, 0);params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@@ -167,7 +167,7 @@ public class BuildListPage extends LayoutPage {@Overrideprotected void onQueryUpdated(AjaxRequestTarget target, String query) {- setResponsePage(BuildListPage.class, paramsOf(query, 0, null));+ setResponsePage(BuildListPage.class, paramsOf(query, 0, 0));}@Override@@ -241,14 +241,13 @@ public class BuildListPage extends LayoutPage {}- public static PageParameters paramsOf(@Nullable String query, int page,- @Nullable Integer expectedCount) {+ public static PageParameters paramsOf(@Nullable String query, int page, int expectedCount) {PageParameters params = new PageParameters();if (query != null)params.add(PARAM_QUERY, query);if (page != 0)params.add(PARAM_CURRENT_PAGE, page);- if (expectedCount != null)+ if (expectedCount != 0)params.add(PARAM_EXPECTED_COUNT, expectedCount);return params;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.java b/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.javaindex 433d3f89fe..14ed69e545 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.java@@ -14,7 +14,7 @@ public class BuildListTab implements MainTab {@Overridepublic Component render(String componentId) {return new ViewStateAwarePageLink<Void>(componentId, BuildListPage.class,- BuildListPage.paramsOf("", 0, null)) {+ BuildListPage.paramsOf("", 0, 0)) {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex 525e65d863..84ba28dd7d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -41,7 +41,7 @@ public class ProjectListPage extends LayoutPage {private static final String PARAM_EXPECTED_COUNT = "expectedCount";- private Integer expectedCount;+ private int expectedCount;private final IModel<String> queryModel = new LoadableDetachableModel<String>() {@@ -74,7 +74,7 @@ public class ProjectListPage extends LayoutPage {public ProjectListPage(PageParameters params) {super(params);- expectedCount = params.get(PARAM_EXPECTED_COUNT).toOptionalInteger();+ expectedCount = params.get(PARAM_EXPECTED_COUNT).toInt(0);}protected GlobalProjectSetting getProjectSetting() {@@ -107,7 +107,7 @@ public class ProjectListPage extends LayoutPage {@Overrideprotected Link<Void> newQueryLink(String componentId, NamedProjectQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, ProjectListPage.class,- ProjectListPage.paramsOf(namedQuery.getQuery(), 0, null));+ ProjectListPage.paramsOf(namedQuery.getQuery(), 0, 0));}@Override@@ -145,7 +145,7 @@ public class ProjectListPage extends LayoutPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(queryModel.getObject(), 0, null);+ PageParameters params = paramsOf(queryModel.getObject(), 0, 0);params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@@ -166,7 +166,7 @@ public class ProjectListPage extends LayoutPage {@Overrideprotected void onQueryUpdated(AjaxRequestTarget target, String query) {- setResponsePage(ProjectListPage.class, paramsOf(query, 0, null));+ setResponsePage(ProjectListPage.class, paramsOf(query, 0, 0));}@Override@@ -235,14 +235,13 @@ public class ProjectListPage extends LayoutPage {}- public static PageParameters paramsOf(@Nullable String query, int page,- @Nullable Integer expectedCount) {+ public static PageParameters paramsOf(@Nullable String query, int page, int expectedCount) {PageParameters params = new PageParameters();if (query != null)params.add(PARAM_QUERY, query);if (page != 0)params.add(PARAM_CURRENT_PAGE, page);- if (expectedCount != null)+ if (expectedCount != 0)params.add(PARAM_EXPECTED_COUNT, expectedCount);return params;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.javaindex 97d4ad31f8..9c68805db6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java@@ -157,7 +157,7 @@ public class ProjectBuildsPage extends ProjectPage {};- add(new BuildListPanel("main", queryModel.getObject(), null) {+ add(new BuildListPanel("main", queryModel.getObject(), 0) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 14e6fa646c..32cfd7aa94 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -55,9 +55,9 @@ import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.build.side.BuildSidePanel;import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.commit.message.CommitMessagePanel;-import io.onedev.server.web.component.confirmaction.ConfirmActionModal;import io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.modal.confirm.ConfirmModal;import io.onedev.server.web.component.sideinfo.SideInfoClosed;import io.onedev.server.web.component.sideinfo.SideInfoOpened;import io.onedev.server.web.component.sideinfo.SideInfoPanel;@@ -226,7 +226,7 @@ public abstract class BuildDetailPage extends ProjectPage};} else {- new ConfirmActionModal(target) {+ new ConfirmModal(target) {@Overrideprotected void onConfirm(AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex c91af49ef4..1999da00e5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -8,20 +8,24 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.Project;+import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@@ -63,7 +67,9 @@ public abstract class ProjectInfoPanel extends Panel {}.setVisible(SecurityUtils.canCreateProjects() && SecurityUtils.canReadCode(getProject())));- WebMarkupContainer forksLink = new WebMarkupContainer("forks") {+ String query = "forks of " + ProjectQuery.quote(getProject().getName());+ PageParameters params = ProjectListPage.paramsOf(query, 0, getProject().getForks().size());+ Link<Void> forksLink = new BookmarkablePageLink<Void>("forks", ProjectListPage.class, params) {@Overrideprotected void onComponentTag(ComponentTag tag) {@@ -74,6 +80,7 @@ public abstract class ProjectInfoPanel extends Panel {};forksLink.add(new Label("label", getProject().getForks().size() + " forks"));+add(forksLink.setEnabled(getProject().getForks().size() != 0));if (getProject().getDescription() != null)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex b1c0038b8d..539707a98d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -137,7 +137,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new BuildListPanel(TAB_CONTENT_ID, null, null) {+ Component content = new BuildListPanel(TAB_CONTENT_ID, null, 0) {@Overrideprotected BuildQuery getBaseQuery() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.javaindex afdc10c87a..f87bc47671 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java@@ -33,7 +33,7 @@ public class FixingBuildsPage extends IssueDetailPage {protected void onInitialize() {super.onInitialize();- add(new BuildListPanel("builds", query, null) {+ add(new BuildListPanel("builds", query, 0) {@Overrideprotected BuildQuery getBaseQuery() {