The Unified and Autonomous Development Platform
Remove editing help field "ownerName" of project into a separate bean
Robin Shen8dae06d55ccc
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex bed86ead24..0d85f49c42 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -30,7 +30,6 @@ import javax.persistence.Lob;import javax.persistence.ManyToOne;import javax.persistence.OneToMany;import javax.persistence.Table;-import javax.persistence.Transient;import org.apache.commons.lang3.SerializationUtils;import org.dom4j.Element;@@ -115,7 +114,6 @@ import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.util.validation.annotation.ProjectName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Markdown;-import io.onedev.server.web.editable.annotation.UserChoice;import io.onedev.server.web.util.ProjectAware;import io.onedev.server.web.util.WicketUtils;@@ -158,9 +156,6 @@ public class Project extends AbstractEntity {@JoinColumnprivate User owner;- @Transient- private String ownerName;-@Column(nullable=false, unique=true)private String name;@@ -309,17 +304,6 @@ public class Project extends AbstractEntity {this.description = description;}- @Editable(order=500, name="Owner", description="Projects without owners are considered orphan projects")- @UserChoice- @NotEmpty- public String getOwnerName() {- return ownerName;- }-- public void setOwnerName(String ownerName) {- this.ownerName = ownerName;- }-public ArrayList<BranchProtection> getBranchProtections() {return branchProtections;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.htmlindex 7afaf461f4..7457af4d0c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html@@ -3,6 +3,7 @@<div class="new-project"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>+ <div wicket:id="ownerEditor"></div><div class="actions"><input class="btn btn-primary dirty-aware" value="Create" type="submit"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex b2c92575da..891d682fca 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -36,9 +36,8 @@ public class NewProjectPage extends LayoutPage {Project project = new Project();Collection<String> properties = Sets.newHashSet("name", "description");- if (SecurityUtils.isAdministrator())- properties.add("ownerName");- project.setOwnerName(SecurityUtils.getUser().getName());+ ProjectOwnerBean ownerBean = new ProjectOwnerBean();+ ownerBean.setOwner(SecurityUtils.getUser().getName());BeanEditor editor = BeanContext.edit("editor", project, properties, false);@@ -54,7 +53,7 @@ public class NewProjectPage extends LayoutPage {editor.error(new Path(new PathNode.Named("name")),"This name has already been used by another project");} else {- project.setOwner(OneDev.getInstance(UserManager.class).findByName(project.getOwnerName()));+ project.setOwner(OneDev.getInstance(UserManager.class).findByName(ownerBean.getOwner()));projectManager.create(project);Session.get().success("New project created");setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));@@ -63,6 +62,7 @@ public class NewProjectPage extends LayoutPage {};form.add(editor);+ form.add(BeanContext.edit("ownerEditor", ownerBean).setVisible(SecurityUtils.isAdministrator()));add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectOwnerBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectOwnerBean.javanew file mode 100644index 0000000000..937e89d785--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectOwnerBean.java@@ -0,0 +1,28 @@+package io.onedev.server.web.page.project;++import java.io.Serializable;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.UserChoice;++@Editable+public class ProjectOwnerBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private String owner;++ @Editable+ @UserChoice+ @NotEmpty+ public String getOwner() {+ return owner;+ }++ public void setOwner(String owner) {+ this.owner = owner;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.htmlindex 48d9b26616..08554ce2d0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.html@@ -6,6 +6,7 @@</div><div class="modal-body"><div wicket:id="editor"></div>+ <div wicket:id="ownerEditor"></div></div><div class="modal-footer"><button wicket:id="save" class="btn btn-primary">Ok</button>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.javaindex 5ca48e8e4b..537d5be22d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java@@ -21,6 +21,7 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.page.project.ProjectOwnerBean;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@SuppressWarnings("serial")@@ -42,15 +43,16 @@ abstract class ForkOptionPanel extends Panel {project.setName(getProject().getName() + "." + SecurityUtils.getUser().getName());Collection<String> properties = Sets.newHashSet("name", "description");- if (SecurityUtils.isAdministrator())- properties.add("ownerName");- project.setOwnerName(SecurityUtils.getUser().getName());+ ProjectOwnerBean ownerBean = new ProjectOwnerBean();+ ownerBean.setOwner(SecurityUtils.getUser().getName());BeanEditor editor = BeanContext.edit("editor", project, properties, false);Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);+form.add(editor);+ form.add(BeanContext.edit("ownerEditor", ownerBean).setVisible(SecurityUtils.isAdministrator()));form.add(new AjaxButton("save") {@@ -64,7 +66,7 @@ abstract class ForkOptionPanel extends Panel {"This name has already been used by another project");target.add(form);} else {- project.setOwner(OneDev.getInstance(UserManager.class).findByName(project.getOwnerName()));+ project.setOwner(OneDev.getInstance(UserManager.class).findByName(ownerBean.getOwner()));projectManager.fork(getProject(), project);Session.get().success("Project forked");setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.htmlindex 7a80997361..ae98e4aebe 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html@@ -4,6 +4,7 @@<p wicket:id="help" class="help-block"></p><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>+ <div wicket:id="ownerEditor"></div><div class="actions"><input class="btn btn-primary dirty-aware" value="Update" type="submit"><a wicket:id="delete" class="delete btn btn-danger pull-right">Delete</a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.javaindex 85c797d060..5e73bd3cf7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java@@ -24,6 +24,7 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.page.project.ProjectListPage;+import io.onedev.server.web.page.project.ProjectOwnerBean;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")@@ -44,10 +45,9 @@ public class GeneralSettingPage extends ProjectSettingPage {add(new Label("help", "Git repository of this project is stored at: " + getProject().getGitDir()));Collection<String> properties = Sets.newHashSet("name", "description");- if (SecurityUtils.isAdministrator()) {- properties.add("ownerName");- getProject().setOwnerName(getProject().getOwner().getName());- }+ ProjectOwnerBean ownerBean = new ProjectOwnerBean();+ ownerBean.setOwner(getProject().getOwner().getName());+editor = BeanContext.editModel("editor", new IModel<Serializable>() {@Override@@ -86,8 +86,7 @@ public class GeneralSettingPage extends ProjectSettingPage {String errorMessage = "This name has already been used by another project";editor.error(new Path(new PathNode.Named("name")), errorMessage);} else {- if (SecurityUtils.isAdministrator())- project.setOwner(OneDev.getInstance(UserManager.class).findByName(project.getOwnerName()));+ project.setOwner(OneDev.getInstance(UserManager.class).findByName(ownerBean.getOwner()));projectManager.save(project, oldName);Session.get().success("General setting has been updated");setResponsePage(GeneralSettingPage.class, paramsOf(project));@@ -96,6 +95,7 @@ public class GeneralSettingPage extends ProjectSettingPage {};form.add(editor);+ form.add(BeanContext.edit("ownerEditor", ownerBean).setVisible(SecurityUtils.isAdministrator()));form.add(new AjaxLink<Void>("delete") {