The Unified and Autonomous Development Platform
fix: Unable to rename group if used in project review requirement (OD-2401)
Robin Shen36fdf5bdfb6b
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javaindex 828e9ba4df..d3cd96dc24 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java@@ -1,8 +1,21 @@package io.onedev.server.entitymanager.impl;+import static org.hibernate.criterion.Restrictions.eq;++import java.util.List;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import com.google.common.base.Preconditions;import com.hazelcast.core.HazelcastInstance;import com.hazelcast.cp.IAtomicLong;+import io.onedev.server.cluster.ClusterManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.IssueFieldManager;@@ -25,17 +38,6 @@ import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.facade.GroupCache;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.util.usage.Usage;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import java.util.List;--import static io.onedev.server.model.Group.PROP_NAME;-import static org.hibernate.criterion.Restrictions.eq;@Singletonpublic class DefaultGroupManager extends BaseEntityManager<Group> implements GroupManager {@@ -135,14 +137,11 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Gro@Sessional@Overridepublic Group find(String name) {- /*GroupFacade facade = cache.find(name);if (facade != null)return load(facade.getId());elsereturn null;- */- return find(newCriteria().add(eq(PROP_NAME, name)));}@Override