The Unified and Autonomous Development Platform
Fix null owner bug when create/edit project
robin shen9ab46bd99058
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 031cee36c9..c40184b372 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -189,7 +189,6 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>@Overridepublic void create(Project project) {dao.persist(project);- project.setOwner(SecurityUtils.getUser());checkSanity(project);listenerRegistry.post(new ProjectCreated(project));@@ -244,7 +243,6 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>@Overridepublic void fork(Project from, Project to) {dao.persist(to);- to.setOwner(SecurityUtils.getUser());FileUtils.cleanDir(to.getGitDir());new CloneCommand(to.getGitDir()).mirror(true).from(from.getGitDir().getAbsolutePath()).call();checkSanity(to);@@ -472,6 +470,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>} else {User user = SecurityUtils.getUser();if (user != null) {+ projects.addAll(user.getProjects());for (Membership membership: user.getMemberships()) {for (GroupAuthorization authorization: membership.getGroup().getProjectAuthorizations()) {if (authorization.getRole().implies(permission))diff --git a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.javaindex cf040b9840..65db6b7e21 100644--- a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java+++ b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java@@ -1,11 +1,12 @@package io.onedev.server.event;import io.onedev.server.model.Project;+import io.onedev.server.util.SecurityUtils;public class ProjectCreated extends ProjectEvent {public ProjectCreated(Project project) {- super(project.getOwner(), project.getCreateDate(), project);+ super(SecurityUtils.getUser(), project.getCreateDate(), project);}}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 fbb9cf5107..bed86ead24 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@@ -115,7 +115,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.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.UserChoice;import io.onedev.server.web.util.ProjectAware;import io.onedev.server.web.util.WicketUtils;@@ -156,7 +155,7 @@ public class Project extends AbstractEntity {private Project forkedFrom;@ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=true)+ @JoinColumnprivate User owner;@Transient@@ -312,7 +311,7 @@ public class Project extends AbstractEntity {@Editable(order=500, name="Owner", description="Projects without owners are considered orphan projects")@UserChoice- @NameOfEmptyValue("No owner")+ @NotEmptypublic String getOwnerName() {return ownerName;}@@ -394,7 +393,6 @@ public class Project extends AbstractEntity {this.forkedFrom = forkedFrom;}- @Nullablepublic User getOwner() {return owner;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.htmlindex 3669dc7961..0720ba6f87 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html@@ -18,7 +18,7 @@<a wicket:id="link"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a></wicket:fragment><wicket:fragment wicket:id="actionFrag">- <a wicket:id="delete" title="Delete this user"><i class="fa fa-trash"></i></a><a wicket:id="impersonate" title="Impersonate this user"><i class="fa fa-user-circle"></i></a>+ <a wicket:id="delete" title="Delete this user"><i class="fa fa-trash"></i></a></wicket:fragment></wicket:extend>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 337796917f..b2c92575da 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@@ -1,15 +1,18 @@package io.onedev.server.web.page.project;+import java.util.Collection;+import org.apache.wicket.Session;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;@@ -32,8 +35,12 @@ public class NewProjectPage extends LayoutPage {Project project = new Project();- BeanEditor editor = BeanContext.edit("editor", project,- Lists.newArrayList("name", "description"), false);+ Collection<String> properties = Sets.newHashSet("name", "description");+ if (SecurityUtils.isAdministrator())+ properties.add("ownerName");+ project.setOwnerName(SecurityUtils.getUser().getName());++ BeanEditor editor = BeanContext.edit("editor", project, properties, false);Form<?> form = new Form<Void>("form") {@@ -47,6 +54,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()));projectManager.create(project);Session.get().success("New project created");setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));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 d421077aef..5ca48e8e4b 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@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.info;+import java.util.Collection;+import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -8,16 +10,17 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;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.project.blob.ProjectBlobPage;@SuppressWarnings("serial")@@ -38,8 +41,12 @@ abstract class ForkOptionPanel extends Panel {project.setForkedFrom(getProject());project.setName(getProject().getName() + "." + SecurityUtils.getUser().getName());- BeanEditor editor = BeanContext.edit("editor", project,- Lists.newArrayList("name", "description", "defaultRoles"), false);+ Collection<String> properties = Sets.newHashSet("name", "description");+ if (SecurityUtils.isAdministrator())+ properties.add("ownerName");+ project.setOwnerName(SecurityUtils.getUser().getName());++ BeanEditor editor = BeanContext.edit("editor", project, properties, false);Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);@@ -57,6 +64,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()));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.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.javaindex 79aa12229f..85c797d060 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@@ -1,22 +1,23 @@package io.onedev.server.web.page.project.setting.general;import java.io.Serializable;+import java.util.Collection;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.project.ConfirmDeleteProjectModal;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@@ -40,16 +41,13 @@ public class GeneralSettingPage extends ProjectSettingPage {protected void onInitialize() {super.onInitialize();- if (!getProject().isNew())- add(new Label("help", "Git repository of this project is stored at: " + getProject().getGitDir()));- else- add(new WebMarkupContainer("help").setVisible(false));+ add(new Label("help", "Git repository of this project is stored at: " + getProject().getGitDir()));- if (getProject().getOwner() != null)+ Collection<String> properties = Sets.newHashSet("name", "description");+ if (SecurityUtils.isAdministrator()) {+ properties.add("ownerName");getProject().setOwnerName(getProject().getOwner().getName());- else- getProject().setOwnerName(null);-+ }editor = BeanContext.editModel("editor", new IModel<Serializable>() {@Override@@ -68,7 +66,7 @@ public class GeneralSettingPage extends ProjectSettingPage {editor.getDescriptor().copyProperties(object, getProject());}- }, Lists.newArrayList("name", "description", "defaultRoleName", "ownerName"), false);+ }, properties, false);Form<?> form = new Form<Void>("form") {@@ -88,10 +86,8 @@ 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 (project.getOwnerName() != null)+ if (SecurityUtils.isAdministrator())project.setOwner(OneDev.getInstance(UserManager.class).findByName(project.getOwnerName()));- else- project.setOwner(null);projectManager.save(project, oldName);Session.get().success("General setting has been updated");setResponsePage(GeneralSettingPage.class, paramsOf(project));