The Unified and Autonomous Development Platform
Fix issue #454 - Users are allowed to set parent's parent to a child (a loop)
Robin Shen04e1e32012d7
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 146d38b306..e9d2811eaa 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@@ -94,7 +94,6 @@ import io.onedev.server.web.component.orderedit.OrderEditPanel;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.stringchoice.StringMultiChoice;-import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;@@ -260,8 +259,6 @@ public abstract class BuildListPanel extends Panel {}.setOutputMarkupPlaceholderTag(true));- BasePage page = (BasePage) getPage();-add(new MenuLink("operations") {@Override@@ -293,7 +290,7 @@ public abstract class BuildListPanel extends Panel {}if (errorMessage != null) {- page.alert(target, errorMessage);+ getSession().error(errorMessage);} else {new ConfirmModalPanel(target) {@@ -428,7 +425,7 @@ public abstract class BuildListPanel extends Panel {}if (errorMessage != null) {- page.alert(target, errorMessage);+ getSession().error(errorMessage);} else {new ConfirmModalPanel(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 49a9f35fbd..831f93f210 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@@ -73,7 +73,6 @@ import io.onedev.server.web.component.project.avatar.ProjectAvatar;import io.onedev.server.web.component.project.selector.ProjectSelector;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;-import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.imports.ProjectImportPage;@@ -254,8 +253,6 @@ public class ProjectListPanel extends Panel {elsecanCreateProjects = SecurityUtils.canCreateProjects();- BasePage page = (BasePage) getPage();-add(new MenuLink("operations") {@Override@@ -308,7 +305,7 @@ public class ProjectListPanel extends Panel {}if (errorMessage != null) {- page.alert(target, errorMessage);+ getSession().error(errorMessage);} else {new ConfirmModalPanel(target) {@@ -397,7 +394,7 @@ public class ProjectListPanel extends Panel {}if (errorMessage != null) {- page.alert(target, errorMessage);+ getSession().error(errorMessage);} else {new ConfirmModalPanel(target) {@@ -471,7 +468,7 @@ public class ProjectListPanel extends Panel {}}if (errorMessage != null) {- page.alert(target, errorMessage);+ getSession().error(errorMessage);} else {new ConfirmModalPanel(target) {@@ -568,7 +565,7 @@ public class ProjectListPanel extends Panel {}if (errorMessage != null) {- page.alert(target, errorMessage);+ getSession().error(errorMessage);} else {new ConfirmModalPanel(target) {@@ -657,7 +654,7 @@ public class ProjectListPanel extends Panel {}if (errorMessage != null) {- page.alert(target, errorMessage);+ getSession().error(errorMessage);} else {new ConfirmModalPanel(target) {@@ -734,7 +731,7 @@ public class ProjectListPanel extends Panel {}if (errorMessage != null) {- page.alert(target, errorMessage);+ getSession().error(errorMessage);} else {new ConfirmModalPanel(target) {diff --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 c22b10241e..cb40d33d11 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@@ -89,7 +89,6 @@ import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.Cursor;@@ -244,8 +243,6 @@ public abstract class PullRequestListPanel extends Panel {}.setOutputMarkupPlaceholderTag(true));- BasePage page = (BasePage) getPage();-add(new MenuLink("operations") {@Override@@ -277,7 +274,7 @@ public abstract class PullRequestListPanel extends Panel {}if (errorMessage != null) {- page.alert(target, errorMessage);+ getSession().error(errorMessage);} else {new ConfirmModalPanel(target) {@@ -400,7 +397,7 @@ public abstract class PullRequestListPanel extends Panel {}if (errorMessage != null) {- page.alert(target, errorMessage);+ getSession().error(errorMessage);} else {new ConfirmModalPanel(target) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.javaindex 94ac097965..ab27b085e0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java@@ -32,8 +32,11 @@ public class ParentChoiceEditor extends PropertyEditor<String> {super.onInitialize();Map<String, String> projectPaths = new LinkedHashMap<>();- for (Project project: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new CreateChildren()))- projectPaths.put(project.getPath(), project.getPath());+ Project currentProject = Project.get();+ for (Project project: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new CreateChildren())) {+ if (currentProject == null || !currentProject.isSelfOrAncestorOf(project))+ projectPaths.put(project.getPath(), project.getPath());+ }String selection = getModelObject();input = new StringSingleChoice("input", Model.of(selection), Model.ofMap(projectPaths), true) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex eaa947ee0d..026aa6ead8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -302,9 +302,4 @@ public abstract class BasePage extends WebPage {handler.appendJavaScript("$(window).resize();");}- public void alert(IPartialPageRequestHandler handler, String message) {- handler.appendJavaScript(String.format("alert('%s');",- JavaScriptEscape.escapeJavaScript(message)));- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.javaindex 7e1e513c48..e4825723d9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java@@ -110,7 +110,8 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {parentError = "Can not use current or descendant project as parent";else if (!SecurityUtils.canCreateChildren(parent))parentError = "Not authorized to move project under this parent";- project.setParent(parent);+ else+ project.setParent(parent);} else if (!SecurityUtils.canCreateRootProjects()) {parentError = "Not authorized to set as root project";} else {