The Unified and Autonomous Development Platform
Using project scoped team instead of global group
Robin Shene6fc480d2aad
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 6544f24aef..8d93e074d8 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -95,8 +95,7 @@ import io.onedev.server.manager.CommitInfoManager;import io.onedev.server.manager.CommitQuerySettingManager;import io.onedev.server.manager.ConfigurationManager;import io.onedev.server.manager.DataManager;-import io.onedev.server.manager.GroupAuthorizationManager;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.manager.TeamManager;import io.onedev.server.manager.IssueActionManager;import io.onedev.server.manager.IssueCommentManager;import io.onedev.server.manager.IssueFieldUnaryManager;@@ -120,7 +119,6 @@ import io.onedev.server.manager.PullRequestWatchManager;import io.onedev.server.manager.SettingManager;import io.onedev.server.manager.StorageManager;import io.onedev.server.manager.UrlManager;-import io.onedev.server.manager.UserAuthorizationManager;import io.onedev.server.manager.UserInfoManager;import io.onedev.server.manager.UserManager;import io.onedev.server.manager.WorkExecutor;@@ -139,8 +137,7 @@ import io.onedev.server.manager.impl.DefaultCommitNotificationManager;import io.onedev.server.manager.impl.DefaultCommitQuerySettingManager;import io.onedev.server.manager.impl.DefaultConfigurationManager;import io.onedev.server.manager.impl.DefaultDataManager;-import io.onedev.server.manager.impl.DefaultGroupAuthorizationManager;-import io.onedev.server.manager.impl.DefaultGroupManager;+import io.onedev.server.manager.impl.DefaultTeamManager;import io.onedev.server.manager.impl.DefaultIssueActionManager;import io.onedev.server.manager.impl.DefaultIssueCommentManager;import io.onedev.server.manager.impl.DefaultIssueFieldUnaryManager;@@ -165,7 +162,6 @@ import io.onedev.server.manager.impl.DefaultPullRequestUpdateManager;import io.onedev.server.manager.impl.DefaultPullRequestWatchManager;import io.onedev.server.manager.impl.DefaultSettingManager;import io.onedev.server.manager.impl.DefaultStorageManager;-import io.onedev.server.manager.impl.DefaultUserAuthorizationManager;import io.onedev.server.manager.impl.DefaultUserInfoManager;import io.onedev.server.manager.impl.DefaultUserManager;import io.onedev.server.manager.impl.DefaultWorkExecutor;@@ -309,10 +305,8 @@ public class CoreModule extends AbstractPluginModule {bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);bind(UserInfoManager.class).to(DefaultUserInfoManager.class);bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);- bind(GroupManager.class).to(DefaultGroupManager.class);+ bind(TeamManager.class).to(DefaultTeamManager.class);bind(MembershipManager.class).to(DefaultMembershipManager.class);- bind(GroupAuthorizationManager.class).to(DefaultGroupAuthorizationManager.class);- bind(UserAuthorizationManager.class).to(DefaultUserAuthorizationManager.class);bind(PullRequestActionManager.class).to(DefaultPullRequestActionManager.class);bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);bind(AttachmentManager.class).to(DefaultAttachmentManager.class);diff --git a/core/src/main/java/io/onedev/server/git/GitFilter.java b/core/src/main/java/io/onedev/server/git/GitFilter.javaindex f59c2d0ad0..766f541e8d 100644--- a/core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/core/src/main/java/io/onedev/server/git/GitFilter.java@@ -138,7 +138,7 @@ public class GitFilter implements Filter {File gitDir = storageManager.getProjectGitDir(project.getId());if (GitSmartHttpTools.isUploadPack(request)) {- if (!SecurityUtils.canRead(project))+ if (!SecurityUtils.canReadCode(project.getFacade()))throw new UnauthorizedException("You do not have permission to pull from this project.");workExecutor.submit(new PrioritizedRunnable(PRIORITY) {@@ -156,7 +156,7 @@ public class GitFilter implements Filter {}).get();} else {- if (!SecurityUtils.canWrite(project)) {+ if (!SecurityUtils.canWriteCode(project.getFacade())) {throw new UnauthorizedException("You do not have permission to push to this project.");}workExecutor.submit(new PrioritizedRunnable(PRIORITY) {@@ -198,12 +198,12 @@ public class GitFilter implements Filter {File gitDir = storageManager.getProjectGitDir(project.getId());if (service.contains("upload")) {- if (!SecurityUtils.canRead(project))+ if (!SecurityUtils.canReadCode(project.getFacade()))throw new UnauthorizedException("You do not have permission to pull from this project.");writeInitial(response, service);new AdvertiseUploadRefsCommand(gitDir).output(response.getOutputStream()).call();} else {- if (!SecurityUtils.canWrite(project)) {+ if (!SecurityUtils.canWriteCode(project.getFacade())) {throw new UnauthorizedException("You do not have permission to push to this project.");}writeInitial(response, service);diff --git a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.javaindex 938e3df5a6..a96d6f64fd 100644--- a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java+++ b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java@@ -21,8 +21,8 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Preconditions;-import io.onedev.server.manager.SettingManager;import io.onedev.server.manager.ProjectManager;+import io.onedev.server.manager.SettingManager;import io.onedev.server.manager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequestUpdate;@@ -32,8 +32,8 @@ import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.utils.StringUtils;import io.onedev.utils.license.LicenseDetail;@@ -151,7 +151,7 @@ public class GitPreReceiveCallback extends HttpServlet {if (refName.startsWith(PullRequestConstants.REFS_PREFIX) || refName.startsWith(PullRequestUpdate.REFS_PREFIX)) {if (!user.asSubject().isPermitted(- new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN))) {+ new ProjectPermission(project.getFacade(), ProjectPrivilege.PROJECT_ADMINISTRATION))) {error(output, refName, "Only project administrators can update onedev refs.");break;}diff --git a/core/src/main/java/io/onedev/server/manager/CacheManager.java b/core/src/main/java/io/onedev/server/manager/CacheManager.javaindex 115829ab19..8c1432db2c 100644--- a/core/src/main/java/io/onedev/server/manager/CacheManager.java+++ b/core/src/main/java/io/onedev/server/manager/CacheManager.java@@ -4,11 +4,9 @@ import java.util.Map;import javax.annotation.Nullable;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.util.facade.MembershipFacade;import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;+import io.onedev.server.util.facade.TeamFacade;import io.onedev.server.util.facade.UserFacade;public interface CacheManager {@@ -17,14 +15,10 @@ public interface CacheManager {Map<Long, UserFacade> getUsers();- Map<Long, GroupFacade> getGroups();+ Map<Long, TeamFacade> getTeams();Map<Long, MembershipFacade> getMemberships();- Map<Long, UserAuthorizationFacade> getUserAuthorizations();-- Map<Long, GroupAuthorizationFacade> getGroupAuthorizations();-@NullableProjectFacade getProject(Long id);@@ -32,17 +26,11 @@ public interface CacheManager {UserFacade getUser(Long id);@Nullable- GroupFacade getGroup(Long id);+ TeamFacade getTeam(Long id);@NullableMembershipFacade getMembership(Long id);- @Nullable- UserAuthorizationFacade getUserAuthorization(Long id);-- @Nullable- GroupAuthorizationFacade getGroupAuthorization(Long id);-@NullableLong getUserIdByName(String name);@@ -55,6 +43,6 @@ public interface CacheManager {Long getProjectIdByName(String name);@Nullable- Long getGroupIdByName(String name);+ Long getTeamId(Long projectId, String name);}diff --git a/core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.java b/core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.javadeleted file mode 100644index b31b0de6dd..0000000000--- a/core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.manager;--import java.util.Collection;--import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.persistence.dao.EntityManager;--public interface GroupAuthorizationManager extends EntityManager<GroupAuthorization> {-- void delete(Collection<GroupAuthorization> authorizations);--}diff --git a/core/src/main/java/io/onedev/server/manager/GroupManager.java b/core/src/main/java/io/onedev/server/manager/GroupManager.javadeleted file mode 100644index 71c8169aee..0000000000--- a/core/src/main/java/io/onedev/server/manager/GroupManager.java+++ /dev/null@@ -1,24 +0,0 @@-package io.onedev.server.manager;--import javax.annotation.Nullable;--import io.onedev.server.model.Group;-import io.onedev.server.persistence.dao.EntityManager;--public interface GroupManager extends EntityManager<Group> {- /**- * Save specified group- *- * @param group- * group to save- * @param oldName- * in case of rename, this parameter should hold the original name- * when above group object is initially loaded to ensure database- * integrity. Use <tt>null</tt> if original name does not exist,- * or the name is not changed- */- void save(Group group, @Nullable String oldName);-- @Nullable- Group find(String name);-}diff --git a/core/src/main/java/io/onedev/server/manager/MembershipManager.java b/core/src/main/java/io/onedev/server/manager/MembershipManager.javaindex 7ec1f1098f..5d1952d8d7 100644--- a/core/src/main/java/io/onedev/server/manager/MembershipManager.java+++ b/core/src/main/java/io/onedev/server/manager/MembershipManager.java@@ -3,9 +3,16 @@ package io.onedev.server.manager;import java.util.Collection;import io.onedev.server.model.Membership;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;+import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityManager;public interface MembershipManager extends EntityManager<Membership> {void delete(Collection<Membership> memberships);++ void assignTeams(User user, Project project, Collection<Team> teams);++ void assignMembers(Team team, Collection<User> members);}diff --git a/core/src/main/java/io/onedev/server/manager/TeamManager.java b/core/src/main/java/io/onedev/server/manager/TeamManager.javanew file mode 100644index 0000000000..9ff6b417bf--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/TeamManager.java@@ -0,0 +1,32 @@+package io.onedev.server.manager;++import javax.annotation.Nullable;++import io.onedev.server.model.Project;+import io.onedev.server.model.Team;+import io.onedev.server.persistence.dao.EntityManager;++public interface TeamManager extends EntityManager<Team> {+ /**+ * Save specified team+ *+ * @param team+ * team to save+ * @param oldName+ * in case of rename, this parameter should hold the original name+ * when above team object is initially loaded to ensure database+ * integrity. Use <tt>null</tt> if original name does not exist,+ * or the name is not changed+ */+ void save(Team team, @Nullable String oldName);++ @Nullable+ Team find(Project project, String name);++ @Nullable+ Team find(String projectName, String teamName);++ @Nullable+ Team findByFQN(String teamFQN);++}diff --git a/core/src/main/java/io/onedev/server/manager/UserAuthorizationManager.java b/core/src/main/java/io/onedev/server/manager/UserAuthorizationManager.javadeleted file mode 100644index c1c4fa14a6..0000000000--- a/core/src/main/java/io/onedev/server/manager/UserAuthorizationManager.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.manager;--import java.util.Collection;--import io.onedev.server.model.UserAuthorization;-import io.onedev.server.persistence.dao.EntityManager;--public interface UserAuthorizationManager extends EntityManager<UserAuthorization> {-- void delete(Collection<UserAuthorization> authorizations);--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.javaindex f26757df1b..621e7ba94f 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java@@ -18,23 +18,20 @@ import com.google.common.collect.HashBiMap;import io.onedev.launcher.loader.Listen;import io.onedev.server.event.lifecycle.SystemStarted;import io.onedev.server.manager.CacheManager;-import io.onedev.server.model.Group;-import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Membership;import io.onedev.server.model.Project;+import io.onedev.server.model.Team;import io.onedev.server.model.User;-import io.onedev.server.model.UserAuthorization;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityPersisted;import io.onedev.server.persistence.dao.EntityRemoved;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.util.facade.MembershipFacade;import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;+import io.onedev.server.util.facade.TeamFacade;import io.onedev.server.util.facade.UserFacade;+import io.onedev.utils.Pair;@Singletonpublic class DefaultCacheManager implements CacheManager {@@ -57,23 +54,15 @@ public class DefaultCacheManager implements CacheManager {private final ReadWriteLock projectsLock = new ReentrantReadWriteLock();- private final Map<Long, GroupFacade> groups = new HashMap<>();+ private final Map<Long, TeamFacade> teams = new HashMap<>();- private final BiMap<String, Long> groupIdsByName = HashBiMap.create();+ private final BiMap<Pair<Long, String>, Long> teamIds = HashBiMap.create();- private final ReadWriteLock groupsLock = new ReentrantReadWriteLock();+ private final ReadWriteLock teamsLock = new ReentrantReadWriteLock();private final Map<Long, MembershipFacade> memberships = new HashMap<>();private final ReadWriteLock membershipsLock = new ReentrantReadWriteLock();-- private final Map<Long, GroupAuthorizationFacade> groupAuthorizations = new HashMap<>();-- private final ReadWriteLock groupAuthorizationsLock = new ReentrantReadWriteLock();-- private final Map<Long, UserAuthorizationFacade> userAuthorizations = new HashMap<>();-- private final ReadWriteLock userAuthorizationsLock = new ReentrantReadWriteLock();@Injectpublic DefaultCacheManager(Dao dao) {@@ -94,16 +83,12 @@ public class DefaultCacheManager implements CacheManager {if (user.getEmail() != null)userIdsByEmail.inverse().put(user.getId(), user.getEmail());}- for (Group group: dao.findAll(Group.class)) {- groups.put(group.getId(), group.getFacade());- groupIdsByName.inverse().put(group.getId(), group.getName());+ for (Team team: dao.findAll(Team.class)) {+ teams.put(team.getId(), team.getFacade());+ teamIds.inverse().put(team.getId(), new Pair<>(team.getProject().getId(), team.getName()));}for (Membership membership: dao.findAll(Membership.class))memberships.put(membership.getId(), membership.getFacade());- for (GroupAuthorization groupAuthorization: dao.findAll(GroupAuthorization.class))- groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization.getFacade());- for (UserAuthorization userAuthorization: dao.findAll(UserAuthorization.class))- userAuthorizations.put(userAuthorization.getId(), userAuthorization.getFacade());}@Transactional@@ -115,14 +100,10 @@ public class DefaultCacheManager implements CacheManager {facade = ((Project) event.getEntity()).getFacade();} else if (event.getEntity() instanceof User) {facade = ((User) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Group) {- facade = ((Group) event.getEntity()).getFacade();+ } else if (event.getEntity() instanceof Team) {+ facade = ((Team) event.getEntity()).getFacade();} else if (event.getEntity() instanceof Membership) {facade = ((Membership) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof UserAuthorization) {- facade = ((UserAuthorization) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof GroupAuthorization) {- facade = ((GroupAuthorization) event.getEntity()).getFacade();} else {facade = null;}@@ -151,14 +132,14 @@ public class DefaultCacheManager implements CacheManager {} finally {usersLock.writeLock().unlock();}- } else if (facade instanceof GroupFacade) {- GroupFacade group = (GroupFacade) facade;- groupsLock.writeLock().lock();+ } else if (facade instanceof TeamFacade) {+ TeamFacade team = (TeamFacade) facade;+ teamsLock.writeLock().lock();try {- groups.put(group.getId(), group);- groupIdsByName.inverse().put(group.getId(), group.getName());+ teams.put(team.getId(), team);+ teamIds.inverse().put(team.getId(), new Pair<>(team.getProjectId(), team.getName()));} finally {- groupsLock.writeLock().unlock();+ teamsLock.writeLock().unlock();}} else if (facade instanceof MembershipFacade) {MembershipFacade membership = (MembershipFacade) facade;@@ -168,23 +149,7 @@ public class DefaultCacheManager implements CacheManager {} finally {membershipsLock.writeLock().unlock();}- } else if (facade instanceof UserAuthorizationFacade) {- UserAuthorizationFacade userAuthorization = (UserAuthorizationFacade) facade;- userAuthorizationsLock.writeLock().lock();- try {- userAuthorizations.put(userAuthorization.getId(), userAuthorization);- } finally {- userAuthorizationsLock.writeLock().unlock();- }- } else if (facade instanceof GroupAuthorizationFacade) {- GroupAuthorizationFacade groupAuthorization = (GroupAuthorizationFacade) facade;- groupAuthorizationsLock.writeLock().lock();- try {- groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization);- } finally {- groupAuthorizationsLock.writeLock().unlock();- }- }+ }}});@@ -209,23 +174,25 @@ public class DefaultCacheManager implements CacheManager {} finally {projectsLock.writeLock().unlock();}- userAuthorizationsLock.writeLock().lock();+ teamsLock.writeLock().lock();try {- for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getProjectId().equals(id))+ for (Iterator<Map.Entry<Long, TeamFacade>> it = teams.entrySet().iterator(); it.hasNext();) {+ TeamFacade team = it.next().getValue();+ if (team.getProjectId().equals(id))it.remove();+ teamIds.inverse().remove(team.getId());+ membershipsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, MembershipFacade>> it2 = memberships.entrySet().iterator(); it2.hasNext();) {+ if (it2.next().getValue().getTeamId().equals(team.getId()))+ it2.remove();+ }+ } finally {+ membershipsLock.writeLock().unlock();+ }}} finally {- userAuthorizationsLock.writeLock().unlock();- }- groupAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getProjectId().equals(id))- it.remove();- }- } finally {- groupAuthorizationsLock.writeLock().unlock();+ teamsLock.writeLock().unlock();}} else if (User.class.isAssignableFrom(clazz)) {usersLock.writeLock().lock();@@ -236,15 +203,6 @@ public class DefaultCacheManager implements CacheManager {} finally {usersLock.writeLock().unlock();}- userAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getUserId().equals(id))- it.remove();- }- } finally {- userAuthorizationsLock.writeLock().unlock();- }membershipsLock.writeLock().lock();try {for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {@@ -254,27 +212,18 @@ public class DefaultCacheManager implements CacheManager {} finally {membershipsLock.writeLock().unlock();}- } else if (Group.class.isAssignableFrom(clazz)) {- groupsLock.writeLock().lock();+ } else if (Team.class.isAssignableFrom(clazz)) {+ teamsLock.writeLock().lock();try {- groups.remove(id);- groupIdsByName.inverse().remove(id);+ teams.remove(id);+ teamIds.inverse().remove(id);} finally {- groupsLock.writeLock().unlock();- }- groupAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getGroupId().equals(id))- it.remove();- }- } finally {- groupAuthorizationsLock.writeLock().unlock();+ teamsLock.writeLock().unlock();}membershipsLock.writeLock().lock();try {for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getGroupId().equals(id))+ if (it.next().getValue().getTeamId().equals(id))it.remove();}} finally {@@ -287,21 +236,7 @@ public class DefaultCacheManager implements CacheManager {} finally {membershipsLock.writeLock().unlock();}- } else if (UserAuthorization.class.isAssignableFrom(clazz)) {- userAuthorizationsLock.writeLock().lock();- try {- userAuthorizations.remove(id);- } finally {- userAuthorizationsLock.writeLock().unlock();- }- } else if (GroupAuthorization.class.isAssignableFrom(clazz)) {- groupAuthorizationsLock.writeLock().lock();- try {- groupAuthorizations.remove(id);- } finally {- groupAuthorizationsLock.writeLock().unlock();- }- }+ }}});@@ -328,12 +263,12 @@ public class DefaultCacheManager implements CacheManager {}@Override- public Map<Long, GroupFacade> getGroups() {- groupsLock.readLock().lock();+ public Map<Long, TeamFacade> getTeams() {+ teamsLock.readLock().lock();try {- return new HashMap<>(groups);+ return new HashMap<>(teams);} finally {- groupsLock.readLock().unlock();+ teamsLock.readLock().unlock();}}@@ -347,26 +282,6 @@ public class DefaultCacheManager implements CacheManager {}}- @Override- public Map<Long, UserAuthorizationFacade> getUserAuthorizations() {- userAuthorizationsLock.readLock().lock();- try {- return new HashMap<>(userAuthorizations);- } finally {- userAuthorizationsLock.readLock().unlock();- }- }-- @Override- public Map<Long, GroupAuthorizationFacade> getGroupAuthorizations() {- groupAuthorizationsLock.readLock().lock();- try {- return new HashMap<>(groupAuthorizations);- } finally {- groupAuthorizationsLock.readLock().unlock();- }- }-@Overridepublic ProjectFacade getProject(Long id) {projectsLock.readLock().lock();@@ -428,22 +343,22 @@ public class DefaultCacheManager implements CacheManager {}@Override- public Long getGroupIdByName(String name) {- groupsLock.readLock().lock();+ public Long getTeamId(Long projectId, String name) {+ teamsLock.readLock().lock();try {- return groupIdsByName.get(name);+ return teamIds.get(new Pair<>(projectId, name));} finally {- groupsLock.readLock().unlock();+ teamsLock.readLock().unlock();}}@Override- public GroupFacade getGroup(Long id) {- groupsLock.readLock().lock();+ public TeamFacade getTeam(Long id) {+ teamsLock.readLock().lock();try {- return groups.get(id);+ return teams.get(id);} finally {- groupsLock.readLock().unlock();+ teamsLock.readLock().unlock();}}@@ -457,24 +372,4 @@ public class DefaultCacheManager implements CacheManager {}}- @Override- public UserAuthorizationFacade getUserAuthorization(Long id) {- userAuthorizationsLock.readLock().lock();- try {- return userAuthorizations.get(id);- } finally {- userAuthorizationsLock.readLock().unlock();- }- }-- @Override- public GroupAuthorizationFacade getGroupAuthorization(Long id) {- groupAuthorizationsLock.readLock().lock();- try {- return groupAuthorizations.get(id);- } finally {- groupAuthorizationsLock.readLock().unlock();- }- }-}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.javaindex 5c41bbf25a..cd3acc8de6 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java@@ -5,6 +5,7 @@ import java.io.ObjectStreamException;import java.io.Serializable;import java.util.ArrayList;import java.util.List;+import java.util.Set;import javax.inject.Inject;import javax.inject.Singleton;@@ -18,6 +19,7 @@ import org.quartz.ScheduleBuilder;import com.google.common.base.Throwables;import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import io.onedev.launcher.bootstrap.Bootstrap;import io.onedev.launcher.loader.Listen;@@ -93,7 +95,8 @@ public class DefaultDataManager implements DataManager, Serializable {if (administrator == null) {administrator = new User();administrator.setId(User.ROOT_ID);- manualConfigs.add(new ManualConfig("Create Administator User", administrator) {+ Set<String> excludedProperties = Sets.newHashSet("administrator", "canCreateProjects");+ manualConfigs.add(new ManualConfig("Create Administator User", administrator, excludedProperties) {@Overridepublic Skippable getSkippable() {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.javadeleted file mode 100644index f87c093254..0000000000--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.java+++ /dev/null@@ -1,30 +0,0 @@-package io.onedev.server.manager.impl;--import java.util.Collection;--import javax.inject.Inject;-import javax.inject.Singleton;--import io.onedev.server.manager.GroupAuthorizationManager;-import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.AbstractEntityManager;-import io.onedev.server.persistence.dao.Dao;--@Singleton-public class DefaultGroupAuthorizationManager extends AbstractEntityManager<GroupAuthorization>- implements GroupAuthorizationManager {-- @Inject- public DefaultGroupAuthorizationManager(Dao dao) {- super(dao);- }-- @Transactional- @Override- public void delete(Collection<GroupAuthorization> authorizations) {- for (GroupAuthorization authorization: authorizations)- delete(authorization);- }--}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.javaindex 3e143c6c64..14be4a0e3d 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java@@ -59,7 +59,7 @@ public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFi@Overridepublic void onRenameGroup(String oldName, String newName) {Query query = getSession().createQuery("update IssueFieldUnary set value=:newName where type=:groupChoice and value=:oldName");- query.setParameter("groupChoice", InputSpec.GROUP);+ query.setParameter("groupChoice", InputSpec.TEAM);query.setParameter("oldName", oldName);query.setParameter("newName", newName);query.executeUpdate();diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.javaindex ec9b42b64e..2060879646 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java@@ -20,10 +20,10 @@ import io.onedev.server.manager.MailManager;import io.onedev.server.manager.MarkdownManager;import io.onedev.server.manager.UrlManager;import io.onedev.server.manager.UserInfoManager;-import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueAction;import io.onedev.server.model.IssueWatch;+import io.onedev.server.model.Team;import io.onedev.server.model.User;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;@@ -126,12 +126,12 @@ public class DefaultIssueNotificationManager {if (event instanceof IssueActionEvent) {IssueAction issueAction = ((IssueActionEvent) event).getAction();- for (Group group: issueAction.getData().getNewGroups().values()) {- for (User member: group.getMembers())+ for (Team team: issueAction.getData().getNewTeams(issue.getProject()).values()) {+ for (User member: team.getMembers())watch(issue, member, true);}String url = urlManager.urlFor(issue);- for (Map.Entry<String, User> entry: issueAction.getData().getNewUsers().entrySet()) {+ for (Map.Entry<String, User> entry: issueAction.getData().getNewUsers(issue.getProject()).entrySet()) {String subject = String.format("You are designated as \"%s\" of issue #%d: %s",entry.getKey(), issue.getNumber(), issue.getTitle());String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMembershipManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMembershipManager.javaindex d11cf1a979..ac14fb4258 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMembershipManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMembershipManager.java@@ -1,12 +1,16 @@package io.onedev.server.manager.impl;import java.util.Collection;+import java.util.Iterator;import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.server.manager.MembershipManager;import io.onedev.server.model.Membership;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;+import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;@@ -26,4 +30,78 @@ public class DefaultMembershipManager extends AbstractEntityManager<Membership>dao.remove(membership);}+ @Transactional+ @Override+ public void assignTeams(User user, Project project, Collection<Team> teams) {+ for (Team team: teams) {+ if (team.getProject().equals(project)) {+ boolean found = false;+ for (Membership membership: user.getMemberships()) {+ if (membership.getTeam().equals(team)) {+ found = true;+ break;+ }+ }+ if (!found) {+ Membership membership = new Membership();+ membership.setTeam(team);+ membership.setUser(user);+ save(membership);+ user.getMemberships().add(membership);+ }+ }+ }+ for (Iterator<Membership> it = user.getMemberships().iterator(); it.hasNext();) {+ Membership membership = it.next();+ if (membership.getTeam().getProject().equals(project)) {+ boolean found = false;+ for (Team team: teams) {+ if (team.equals(membership.getTeam())) {+ found = true;+ break;+ }+ }+ if (!found) {+ delete(membership);+ it.remove();+ }+ }+ }+ }++ @Transactional+ @Override+ public void assignMembers(Team team, Collection<User> members) {+ for (User member: members) {+ boolean found = false;+ for (Membership membership: team.getMemberships()) {+ if (membership.getUser().equals(member)) {+ found = true;+ break;+ }+ }+ if (!found) {+ Membership membership = new Membership();+ membership.setTeam(team);+ membership.setUser(member);+ save(membership);+ team.getMemberships().add(membership);+ }+ }+ for (Iterator<Membership> it = team.getMemberships().iterator(); it.hasNext();) {+ Membership membership = it.next();+ boolean found = false;+ for (User member: members) {+ if (member.equals(membership.getUser())) {+ found = true;+ break;+ }+ }+ if (!found) {+ delete(membership);+ it.remove();+ }+ }+ }+}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.javaindex 8d62b500a1..0bc2bfca23 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java@@ -41,24 +41,26 @@ import io.onedev.server.git.command.ListChangedFilesCommand;import io.onedev.server.manager.BuildManager;import io.onedev.server.manager.CacheManager;import io.onedev.server.manager.CommitInfoManager;+import io.onedev.server.manager.MembershipManager;import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserAuthorizationManager;+import io.onedev.server.manager.TeamManager;import io.onedev.server.model.Build;+import io.onedev.server.model.Membership;import io.onedev.server.model.Project;+import io.onedev.server.model.Team;import io.onedev.server.model.User;-import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.FileProtection;import io.onedev.server.model.support.TagProtection;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.facade.GroupAuthorizationFacade;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.facade.MembershipFacade;import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;+import io.onedev.server.util.facade.TeamFacade;+import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.utils.FileUtils;import io.onedev.utils.StringUtils;@@ -71,7 +73,9 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemprivate final CommitInfoManager commitInfoManager;- private final UserAuthorizationManager userAuthorizationManager;+ private final TeamManager teamManager;++ private final MembershipManager membershipManager;private final BuildManager buildManager;@@ -83,12 +87,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem@Injectpublic DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager, ListenerRegistry listenerRegistry,- UserAuthorizationManager userAuthorizationManager, BuildManager buildManager, CacheManager cacheManager) {+ TeamManager teamManager, MembershipManager membershipManager, BuildManager buildManager,+ CacheManager cacheManager) {super(dao);this.commitInfoManager = commitInfoManager;this.listenerRegistry = listenerRegistry;- this.userAuthorizationManager = userAuthorizationManager;+ this.teamManager = teamManager;+ this.membershipManager = membershipManager;this.buildManager = buildManager;this.cacheManager = cacheManager;@@ -135,11 +141,15 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemdao.persist(project);if (isNew) {- UserAuthorization authorization = new UserAuthorization();- authorization.setPrivilege(ProjectPrivilege.ADMIN);- authorization.setProject(project);- authorization.setUser(SecurityUtils.getUser());- userAuthorizationManager.save(authorization);+ Team team = new Team();+ team.setProject(project);+ team.setName("Administrators");+ team.setPrivilege(ProjectPrivilege.PROJECT_ADMINISTRATION);+ teamManager.save(team);+ Membership membership = new Membership();+ membership.setTeam(team);+ membership.setUser(SecurityUtils.getUser());+ membershipManager.save(membership);}if (oldName != null && !project.getName().equals(oldName))@@ -285,25 +295,18 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemif (SecurityUtils.isAdministrator()) {projects.addAll(cacheManager.getProjects().values());} else {- for (ProjectFacade project: cacheManager.getProjects().values()) {- if (project.isPublicRead())- projects.add(project);- }if (user != null) {- Collection<Long> groupIds = new HashSet<>();for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (membership.getUserId().equals(user.getId()))- groupIds.add(membership.getGroupId());- }- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (groupIds.contains(authorization.getGroupId()))- projects.add(cacheManager.getProject(authorization.getProjectId()));- }- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getUserId().equals(user.getId()))- projects.add(cacheManager.getProject(authorization.getProjectId()));+ if (membership.getUserId().equals(user.getId())) {+ TeamFacade team = cacheManager.getTeam(membership.getTeamId());+ projects.add(cacheManager.getProject(team.getProjectId()));+ }}}+ for (ProjectFacade project: cacheManager.getProjects().values()) {+ if (project.getDefaultPrivilege() != null)+ projects.add(project);+ }}return projects;@@ -324,16 +327,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implempublic boolean isModificationNeedsQualityCheck(User user, Project project, String branch, @Nullable String file) {BranchProtection branchProtection = project.getBranchProtection(branch, user);if (branchProtection != null) {- if (branchProtection.getReviewRequirement() != null- && !branchProtection.getReviewRequirement().matches(user)) {+ if (!ReviewRequirement.parse(project, branchProtection.getReviewRequirement()).matches(user))return true;- }if (!branchProtection.getConfigurations().isEmpty())return true;if (file != null) {FileProtection fileProtection = branchProtection.getFileProtection(file);- if (fileProtection != null && !fileProtection.getReviewRequirement().matches(user))+ if (fileProtection != null && !ReviewRequirement.parse(project, fileProtection.getReviewRequirement()).matches(user))return true;}}@@ -345,10 +346,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemObjectId newObjectId, Map<String, String> gitEnvs) {BranchProtection branchProtection = project.getBranchProtection(branch, user);if (branchProtection != null) {- if (branchProtection.getReviewRequirement() != null- && !branchProtection.getReviewRequirement().matches(user)) {+ if (!ReviewRequirement.parse(project, branchProtection.getReviewRequirement()).matches(user))return true;- }List<Build> builds = buildManager.findAll(project, newObjectId.name());if (!builds.stream().map(it->it.getConfiguration().getName()).collect(Collectors.toSet())@@ -358,7 +357,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemfor (String changedFile: getChangedFiles(project, oldObjectId, newObjectId, gitEnvs)) {FileProtection fileProtection = branchProtection.getFileProtection(changedFile);- if (fileProtection != null && !fileProtection.getReviewRequirement().matches(user))+ if (fileProtection != null && !ReviewRequirement.parse(project, fileProtection.getReviewRequirement()).matches(user))return true;}}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.javaindex cd351dc132..d9fab3d001 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java@@ -79,13 +79,13 @@ import io.onedev.server.manager.PullRequestUpdateManager;import io.onedev.server.manager.UserManager;import io.onedev.server.model.Build;import io.onedev.server.model.Configuration;-import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestAction;import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.model.Team;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.FileProtection;@@ -118,13 +118,12 @@ import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryBuildContext;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.BatchWorker;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.util.reviewrequirement.InvalidReviewRuleException;import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.utils.concurrent.Prioritized;@@ -680,9 +679,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpublic void checkQuality(PullRequest request) {BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());if (branchProtection != null) {- ReviewRequirement reviewRequirement = branchProtection.getReviewRequirement();- if (reviewRequirement != null)- checkReviews(reviewRequirement, request.getLatestUpdate());+ checkReviews(ReviewRequirement.parse(request.getTargetProject(), branchProtection.getReviewRequirement()), request.getLatestUpdate());if (branchProtection.getConfigurations() != null)checkBuilds(request, branchProtection.getConfigurations(), branchProtection.isBuildMerges());@@ -696,19 +693,19 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestFileProtection fileProtection = branchProtection.getFileProtection(file);if (fileProtection != null && !checkedFileProtections.contains(fileProtection)) {checkedFileProtections.add(fileProtection);- checkReviews(fileProtection.getReviewRequirement(), update);+ checkReviews(ReviewRequirement.parse(request.getTargetProject(), fileProtection.getReviewRequirement()), update);}}}- }-- ProjectFacade project = request.getTargetProject().getFacade();- Permission writePermission = new ProjectPermission(project, ProjectPrivilege.WRITE);- if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writePermission)) {- Collection<User> writers = new ArrayList<>();- for (UserFacade facade: SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.WRITE))- writers.add(userManager.load(facade.getId()));- checkReviews(writers, 1, request.getLatestUpdate());++ ProjectFacade project = request.getTargetProject().getFacade();+ Permission writeCode = new ProjectPermission(project, ProjectPrivilege.CODE_WRITE);+ if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writeCode)) {+ Collection<User> writers = new ArrayList<>();+ for (UserFacade facade: SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.CODE_WRITE))+ writers.add(userManager.load(facade.getId()));+ checkReviews(writers, 1, request.getLatestUpdate());+ }}}@@ -774,10 +771,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}}- for (Map.Entry<Group, Integer> entry: reviewRequirement.getGroups().entrySet()) {- Group group = entry.getKey();+ for (Map.Entry<Team, Integer> entry: reviewRequirement.getTeams().entrySet()) {+ Team team = entry.getKey();int requiredCount = entry.getValue();- checkReviews(group.getMembers(), requiredCount, update);+ checkReviews(team.getMembers(), requiredCount, update);}}@@ -867,7 +864,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestString errorMessage = String.format("Impossible to provide required number of reviewers "+ "(candidates: %s, required number of reviewers: %d, pull request: #%d)",reviewers, missingCount, update.getRequest().getNumber());- throw new InvalidReviewRuleException(errorMessage);+ throw new OneException(errorMessage);}}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultTeamManager.javasimilarity index 55%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.javarename to core/src/main/java/io/onedev/server/manager/impl/DefaultTeamManager.javaindex 914e563cc6..e0d0b74f50 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultTeamManager.java@@ -6,70 +6,60 @@ import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.GroupManager;import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.ProjectManager;-import io.onedev.server.model.Group;+import io.onedev.server.manager.TeamManager;import io.onedev.server.model.Project;+import io.onedev.server.model.Team;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.security.authenticator.Authenticator;+import io.onedev.utils.StringUtils;@Singleton-public class DefaultGroupManager extends AbstractEntityManager<Group> implements GroupManager {+public class DefaultTeamManager extends AbstractEntityManager<Team> implements TeamManager {private final ProjectManager projectManager;- private final SettingManager configManager;-private final CacheManager cacheManager;private final IssueFieldUnaryManager issueFieldManager;@Inject- public DefaultGroupManager(Dao dao, ProjectManager projectManager, SettingManager configManager,+ public DefaultTeamManager(Dao dao, ProjectManager projectManager,CacheManager cacheManager, IssueFieldUnaryManager issueFieldManager) {super(dao);this.projectManager = projectManager;- this.configManager = configManager;this.cacheManager = cacheManager;this.issueFieldManager = issueFieldManager;}@Transactional@Override- public void save(Group group, String oldName) {- if (oldName != null && !oldName.equals(group.getName())) {+ public void save(Team team, String oldName) {+ if (oldName != null && !oldName.equals(team.getName())) {for (Project project: projectManager.findAll()) {for (BranchProtection protection: project.getBranchProtections())- protection.onRenameGroup(oldName, group.getName());+ protection.onRenameTeam(project, oldName, team.getName());for (TagProtection protection: project.getTagProtections())- protection.onRenameGroup(oldName, group.getName());- project.getIssueWorkflow().onRenameGroup(oldName, group.getName());- }-- Authenticator authenticator = configManager.getAuthenticator();- if (authenticator != null) {- authenticator.onRenameGroup(oldName, group.getName());- configManager.saveAuthenticator(authenticator);+ protection.onRenameGroup(oldName, team.getName());+ project.getIssueWorkflow().onRenameGroup(oldName, team.getName());}- issueFieldManager.onRenameGroup(oldName, group.getName());+ issueFieldManager.onRenameGroup(oldName, team.getName());}- dao.persist(group);+ dao.persist(team);}@Transactional@Override- public void delete(Group group) {+ public void delete(Team group) {for (Project project: projectManager.findAll()) {for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {- if (it.next().onDeleteGroup(group.getName()))+ if (it.next().onDeleteTeam(project, group.getName()))it.remove();}for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {@@ -78,23 +68,35 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements}project.getIssueWorkflow().onDeleteGroup(group.getName());}- Authenticator authenticator = configManager.getAuthenticator();- if (authenticator != null) {- authenticator.onDeleteGroup(group.getName());- configManager.saveAuthenticator(authenticator);- }dao.remove(group);}@Sessional@Override- public Group find(String name) {- Long id = cacheManager.getGroupIdByName(name);+ public Team find(Project project, String name) {+ Long id = cacheManager.getTeamId(project.getId(), name);if (id != null)return load(id);elsereturn null;}++ @Sessional+ @Override+ public Team find(String projectName, String teamName) {+ Project project = projectManager.find(projectName);+ if (project != null)+ return find(project, teamName);+ else+ return null;+ }+ @Sessional+ @Override+ public Team findByFQN(String teamFQN) {+ return find(StringUtils.substringBefore(teamFQN, Team.FQN_SEPARATOR),+ StringUtils.substringAfter(teamFQN, Team.FQN_SEPARATOR));+ }+}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserAuthorizationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserAuthorizationManager.javadeleted file mode 100644index f3d229f8f3..0000000000--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserAuthorizationManager.java+++ /dev/null@@ -1,30 +0,0 @@-package io.onedev.server.manager.impl;--import java.util.Collection;--import javax.inject.Inject;-import javax.inject.Singleton;--import io.onedev.server.manager.UserAuthorizationManager;-import io.onedev.server.model.UserAuthorization;-import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.AbstractEntityManager;-import io.onedev.server.persistence.dao.Dao;--@Singleton-public class DefaultUserAuthorizationManager extends AbstractEntityManager<UserAuthorization>- implements UserAuthorizationManager {-- @Inject- public DefaultUserAuthorizationManager(Dao dao) {- super(dao);- }-- @Transactional- @Override- public void delete(Collection<UserAuthorization> authorizations) {- for (UserAuthorization authorization: authorizations)- dao.remove(authorization);- }--}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.javaindex 7b5c3417f6..d4331aa9ab 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java@@ -67,7 +67,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uif (oldName != null && !oldName.equals(user.getName())) {for (Project project: projectManager.findAll()) {for (BranchProtection protection: project.getBranchProtections())- protection.onRenameUser(oldName, user.getName());+ protection.onRenameUser(project, oldName, user.getName());for (TagProtection protection: project.getTagProtections())protection.onRenameUser(oldName, user.getName());project.getIssueWorkflow().onRenameUser(oldName, user.getName());@@ -143,7 +143,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Ufor (Project project: projectManager.findAll()) {for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {- if (it.next().onDeleteUser(user.getName()))+ if (it.next().onDeleteUser(project, user.getName()))it.remove();}for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {diff --git a/core/src/main/java/io/onedev/server/model/GroupAuthorization.java b/core/src/main/java/io/onedev/server/model/GroupAuthorization.javadeleted file mode 100644index 053759e941..0000000000--- a/core/src/main/java/io/onedev/server/model/GroupAuthorization.java+++ /dev/null@@ -1,63 +0,0 @@-package io.onedev.server.model;--import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;--import io.onedev.server.security.ProjectPrivilege;-import io.onedev.server.util.facade.GroupAuthorizationFacade;--@Entity-@Table(- indexes={@Index(columnList="g_group_id"), @Index(columnList="g_project_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_group_id", "g_project_id"})-})-public class GroupAuthorization extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Project project;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Group group;-- @Column(nullable=false)- private ProjectPrivilege privilege = ProjectPrivilege.READ;-- public Project getProject() {- return project;- }-- public void setProject(Project project) {- this.project = project;- }-- public Group getGroup() {- return group;- }-- public void setGroup(Group group) {- this.group = group;- }-- public ProjectPrivilege getPrivilege() {- return privilege;- }-- public void setPrivilege(ProjectPrivilege privilege) {- this.privilege = privilege;- }-- public GroupAuthorizationFacade getFacade() {- return new GroupAuthorizationFacade(this);- }--}diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 0ef33e2f56..590aff868a 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -123,7 +123,7 @@ public class Issue extends AbstractEntity implements Referenceable {private Collection<IssueComment> comments = new ArrayList<>();@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)- private Collection<IssueAction> changes = new ArrayList<>();+ private Collection<IssueAction> actions = new ArrayList<>();@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueVote> votes = new ArrayList<>();@@ -231,12 +231,12 @@ public class Issue extends AbstractEntity implements Referenceable {this.comments = comments;}- public Collection<IssueAction> getChanges() {- return changes;+ public Collection<IssueAction> getActions() {+ return actions;}- public void setChanges(Collection<IssueAction> changes) {- this.changes = changes;+ public void setChanges(Collection<IssueAction> actions) {+ this.actions = actions;}public Collection<IssueVote> getVotes() {diff --git a/core/src/main/java/io/onedev/server/model/Membership.java b/core/src/main/java/io/onedev/server/model/Membership.javaindex ad08d4fb50..827a15aff0 100644--- a/core/src/main/java/io/onedev/server/model/Membership.java+++ b/core/src/main/java/io/onedev/server/model/Membership.java@@ -12,8 +12,8 @@ import io.onedev.server.util.facade.MembershipFacade;@Entity@Table(- indexes={@Index(columnList="g_user_id"), @Index(columnList="g_group_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_group_id"})+ indexes={@Index(columnList="g_user_id"), @Index(columnList="g_team_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_team_id"})})public class Membership extends AbstractEntity {@@ -25,7 +25,7 @@ public class Membership extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Group group;+ private Team team;public User getUser() {return user;@@ -35,12 +35,12 @@ public class Membership extends AbstractEntity {this.user = user;}- public Group getGroup() {- return group;+ public Team getTeam() {+ return team;}- public void setGroup(Group group) {- this.group = group;+ public void setTeam(Team team) {+ this.team = team;}public MembershipFacade getFacade() {diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 6614bb58e2..bb8ceed5d0 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -95,6 +95,7 @@ import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.persistence.UnitOfWork;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.validation.annotation.ProjectName;import io.onedev.server.web.editable.annotation.Editable;@@ -129,8 +130,8 @@ public class Project extends AbstractEntity {@Column(length=65535)private String description;- private boolean publicRead;-+ private ProjectPrivilege defaultPrivilege;+@Lob@Column(length=65535, name="COMMIT_MSG_TRANSFORM")private CommitMessageTransformSetting commitMessageTransformSetting;@@ -168,15 +169,12 @@ public class Project extends AbstractEntity {@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Issue> issues = new ArrayList<>();+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<Team> teams = new ArrayList<>();+@OneToMany(mappedBy="forkedFrom")private Collection<Project> forks = new ArrayList<>();- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<UserAuthorization> userAuthorizations = new ArrayList<>();-@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<CodeComment> codeComments = new ArrayList<>();@@ -266,13 +264,14 @@ public class Project extends AbstractEntity {this.description = description;}- @Editable(order=300, name="Public", description="Whether or not code of this project can be accessed by everyone")- public boolean isPublicRead() {- return publicRead;+ @Editable(order=300, description="Optionally specify default privilege for users not "+ + "joining any teams of the project")+ public ProjectPrivilege getDefaultPrivilege() {+ return defaultPrivilege;}- public void setPublicRead(boolean publicRead) {- this.publicRead = publicRead;+ public void setDefaultPrivilege(ProjectPrivilege defaultPrivilege) {+ this.defaultPrivilege = defaultPrivilege;}@Nullable@@ -333,6 +332,14 @@ public class Project extends AbstractEntity {this.outgoingRequests = outgoingRequests;}+ public Collection<Team> getTeams() {+ return teams;+ }++ public void setTeams(Collection<Team> teams) {+ this.teams = teams;+ }+public Project getForkedFrom() {return forkedFrom;}@@ -833,22 +840,6 @@ public class Project extends AbstractEntity {});}- public Collection<GroupAuthorization> getGroupAuthorizations() {- return groupAuthorizations;- }-- public void setGroupAuthorizations(Collection<GroupAuthorization> groupAuthorizations) {- this.groupAuthorizations = groupAuthorizations;- }-- public Collection<UserAuthorization> getUserAuthorizations() {- return userAuthorizations;- }-- public void setAuthorizedUsers(Collection<UserAuthorization> userAuthorizations) {- this.userAuthorizations = userAuthorizations;- }-public Collection<CodeComment> getCodeComments() {return codeComments;}diff --git a/core/src/main/java/io/onedev/server/model/Group.java b/core/src/main/java/io/onedev/server/model/Team.javasimilarity index 50%rename from core/src/main/java/io/onedev/server/model/Group.javarename to core/src/main/java/io/onedev/server/model/Team.javaindex f9c9305dc1..cdbd2f2e5e 100644--- a/core/src/main/java/io/onedev/server/model/Group.java+++ b/core/src/main/java/io/onedev/server/model/Team.java@@ -7,39 +7,57 @@ import java.util.HashSet;import javax.persistence.CascadeType;import javax.persistence.Column;import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;+import javax.validation.constraints.NotNull;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.util.facade.TeamFacade;import io.onedev.server.web.editable.annotation.Editable;@Entity@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editable-public class Group extends AbstractEntity {+@Table(+ indexes={@Index(columnList="g_project_id"), @Index(columnList="name")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "name"})})+public class Team extends AbstractEntity {private static final long serialVersionUID = 1L;- @Column(unique=true, nullable=false)- private String name;+ public static final String FQN_SEPARATOR = ":";- private String description;+ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project project;- private boolean administrator;+ @Column(nullable=false)+ private String name;- private boolean canCreateProjects = true;-- @OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)- private Collection<GroupAuthorization> authorizations = new ArrayList<>();+ private ProjectPrivilege privilege;- @OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)+ @OneToMany(mappedBy="team", cascade=CascadeType.REMOVE)private Collection<Membership> memberships = new ArrayList<>();private transient Collection<User> members;+ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }+@Editable(order=100)@NotEmptypublic String getName() {@@ -50,39 +68,14 @@ public class Group extends AbstractEntity {this.name = name;}- @Editable(order=200, description="Optionally describe the group")- public String getDescription() {- return description;- }-- public void setDescription(String description) {- this.description = description;- }-@Editable(order=300)- public boolean isAdministrator() {- return administrator;+ @NotNull+ public ProjectPrivilege getPrivilege() {+ return privilege;}- public void setAdministrator(boolean administrator) {- this.administrator = administrator;- }-- @Editable(order=400)- public boolean isCanCreateProjects() {- return canCreateProjects;- }-- public void setCanCreateProjects(boolean canCreateProjects) {- this.canCreateProjects = canCreateProjects;- }-- public Collection<GroupAuthorization> getAuthorizations() {- return authorizations;- }-- public void setAuthorizations(Collection<GroupAuthorization> authorizations) {- this.authorizations = authorizations;+ public void setPrivilege(ProjectPrivilege privilege) {+ this.privilege = privilege;}public Collection<Membership> getMemberships() {@@ -105,12 +98,16 @@ public class Group extends AbstractEntity {@Overridepublic int compareTo(AbstractEntity entity) {- Group group = (Group) entity;- return getName().compareTo(group.getName());+ Team team = (Team) entity;+ return getName().compareTo(team.getName());}- public GroupFacade getFacade() {- return new GroupFacade(this);+ public TeamFacade getFacade() {+ return new TeamFacade(this);+ }++ public String getFQN() {+ return getProject().getName() + FQN_SEPARATOR + getName();}}diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.javaindex 8d6bfcf027..920a1f8f26 100644--- a/core/src/main/java/io/onedev/server/model/User.java+++ b/core/src/main/java/io/onedev/server/model/User.java@@ -57,6 +57,10 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Column(unique=true)private String email;+ private boolean administrator;++ private boolean canCreateProjects = true;+@Column(nullable=false)private String uuid = UUID.randomUUID().toString();@@ -70,9 +74,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<Membership> memberships = new ArrayList<>();- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<UserAuthorization> authorizations = new ArrayList<>();-@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<PullRequestReview> reviews = new ArrayList<>();@@ -163,6 +164,24 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.email = email;}+ @Editable(order=400)+ public boolean isAdministrator() {+ return administrator;+ }++ public void setAdministrator(boolean administrator) {+ this.administrator = administrator;+ }++ @Editable(order=500)+ public boolean isCanCreateProjects() {+ return canCreateProjects;+ }++ public void setCanCreateProjects(boolean canCreateProjects) {+ this.canCreateProjects = canCreateProjects;+ }+public Collection<Membership> getMemberships() {return memberships;}@@ -198,14 +217,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {return version;}- public Collection<UserAuthorization> getAuthorizations() {- return authorizations;- }-- public void setAuthorizedProjects(Collection<UserAuthorization> authorizations) {- this.authorizations = authorizations;- }-public Collection<IssueQuerySetting> getIssueQuerySettings() {return issueQuerySettings;}diff --git a/core/src/main/java/io/onedev/server/model/UserAuthorization.java b/core/src/main/java/io/onedev/server/model/UserAuthorization.javadeleted file mode 100644index 06788db11f..0000000000--- a/core/src/main/java/io/onedev/server/model/UserAuthorization.java+++ /dev/null@@ -1,63 +0,0 @@-package io.onedev.server.model;--import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;--import io.onedev.server.security.ProjectPrivilege;-import io.onedev.server.util.facade.UserAuthorizationFacade;--@Entity-@Table(- indexes={@Index(columnList="g_user_id"), @Index(columnList="g_project_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_project_id"})-})-public class UserAuthorization extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Project project;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private User user;-- @Column(nullable=false)- private ProjectPrivilege privilege = ProjectPrivilege.READ;-- public Project getProject() {- return project;- }-- public void setProject(Project project) {- this.project = project;- }-- public User getUser() {- return user;- }-- public void setUser(User user) {- this.user = user;- }-- public ProjectPrivilege getPrivilege() {- return privilege;- }-- public void setPrivilege(ProjectPrivilege privilege) {- this.privilege = privilege;- }-- public UserAuthorizationFacade getFacade() {- return new UserAuthorizationFacade(this);- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex 9aee199c11..edd08d0784 100644--- a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -4,26 +4,23 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.Iterator;import java.util.List;-import java.util.Optional;import javax.annotation.Nullable;import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;-import com.google.common.base.Preconditions;--import io.onedev.server.model.Group;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;import io.onedev.server.model.User;import io.onedev.server.model.support.ifsubmittedby.Anyone;import io.onedev.server.model.support.ifsubmittedby.IfSubmittedBy;-import io.onedev.server.model.support.ifsubmittedby.SpecifiedGroup;+import io.onedev.server.model.support.ifsubmittedby.SpecifiedTeam;import io.onedev.server.model.support.ifsubmittedby.SpecifiedUser;import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.server.web.editable.annotation.BranchPattern;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.ReviewRequirementSpec;import io.onedev.server.web.editable.annotation.ConfigurationChoice;+import io.onedev.server.web.editable.annotation.Editable;import io.onedev.utils.PathUtils;@Editable@@ -43,14 +40,12 @@ public class BranchProtection implements Serializable {private boolean noCreation = true;- private String reviewRequirementSpec;+ private String reviewRequirement;private List<String> configurations = new ArrayList<>();private boolean buildMerges;- private transient Optional<ReviewRequirement> reviewRequirementOpt;-private List<FileProtection> fileProtections = new ArrayList<>();public boolean isEnabled() {@@ -113,13 +108,13 @@ public class BranchProtection implements Serializable {@Editable(order=400, name="Required Reviewers", description="Optionally specify required reviewers for changes of "+ "specified branch. OneDev assumes that the user submitting the change has completed the review already")- @ReviewRequirementSpec- public String getReviewRequirementSpec() {- return reviewRequirementSpec;+ @io.onedev.server.web.editable.annotation.ReviewRequirement+ public String getReviewRequirement() {+ return reviewRequirement;}- public void setReviewRequirementSpec(String reviewRequirementSpec) {- this.reviewRequirementSpec = reviewRequirementSpec;+ public void setReviewRequirement(String reviewRequirement) {+ this.reviewRequirement = reviewRequirement;}@Editable(order=500, name="Required Builds", description="Optionally choose required builds")@@ -162,65 +157,46 @@ public class BranchProtection implements Serializable {return null;}- @Nullable- public ReviewRequirement getReviewRequirement() {- if (reviewRequirementOpt == null) {- if (reviewRequirementSpec != null)- reviewRequirementOpt = Optional.of(new ReviewRequirement(reviewRequirementSpec));- else- reviewRequirementOpt = Optional.empty();- }- return reviewRequirementOpt.orElse(null);- }-- public void onRenameGroup(String oldName, String newName) {- if (getSubmitter() instanceof SpecifiedGroup) {- SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();- if (specifiedGroup.getGroupName().equals(oldName))- specifiedGroup.setGroupName(newName);+ public void onRenameTeam(Project project, String oldName, String newName) {+ if (getSubmitter() instanceof SpecifiedTeam) {+ SpecifiedTeam specifiedTeam = (SpecifiedTeam) getSubmitter();+ if (specifiedTeam.getTeamName().equals(oldName))+ specifiedTeam.setTeamName(newName);}- ReviewRequirement reviewRequirement = getReviewRequirement();- if (reviewRequirement != null) {- for (Group group: reviewRequirement.getGroups().keySet()) {- if (group.getName().equals(oldName))- group.setName(newName);- }- setReviewRequirementSpec(reviewRequirement.toSpec());+ ReviewRequirement reviewRequirement = ReviewRequirement.parse(project, this.reviewRequirement);+ for (Team team: reviewRequirement.getTeams().keySet()) {+ if (team.getName().equals(oldName))+ team.setName(newName);}+ setReviewRequirement(reviewRequirement.toString());for (FileProtection fileProtection: getFileProtections()) {- reviewRequirement = fileProtection.getReviewRequirement();- for (Group group: reviewRequirement.getGroups().keySet()) {- if (group.getName().equals(oldName))- group.setName(newName);+ reviewRequirement = ReviewRequirement.parse(project, fileProtection.getReviewRequirement());+ for (Team team: reviewRequirement.getTeams().keySet()) {+ if (team.getName().equals(oldName))+ team.setName(newName);}- String spec = reviewRequirement.toSpec();- Preconditions.checkState(spec != null);- fileProtection.setReviewRequirementSpec(spec);+ fileProtection.setReviewRequirement(reviewRequirement.toString());}}- public boolean onDeleteGroup(String groupName) {- if (getSubmitter() instanceof SpecifiedGroup) {- SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();- if (specifiedGroup.getGroupName().equals(groupName))+ public boolean onDeleteTeam(Project project, String teamName) {+ if (getSubmitter() instanceof SpecifiedTeam) {+ SpecifiedTeam specifiedTeam = (SpecifiedTeam) getSubmitter();+ if (specifiedTeam.getTeamName().equals(teamName))return true;}- ReviewRequirement reviewRequirement = getReviewRequirement();- if (reviewRequirement != null) {- for (Group group: reviewRequirement.getGroups().keySet()) {- if (group.getName().equals(groupName))- return true;- }+ for (Team team: ReviewRequirement.parse(project, this.reviewRequirement).getTeams().keySet()) {+ if (team.getName().equals(teamName))+ return true;}for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {FileProtection protection = it.next();- reviewRequirement = protection.getReviewRequirement();- for (Group group: reviewRequirement.getGroups().keySet()) {- if (group.getName().equals(groupName)) {+ for (Team team: ReviewRequirement.parse(project, protection.getReviewRequirement()).getTeams().keySet()) {+ if (team.getName().equals(teamName)) {it.remove();break;}@@ -240,53 +216,45 @@ public class BranchProtection implements Serializable {getConfigurations().remove(configurationName);}- public void onRenameUser(String oldName, String newName) {+ public void onRenameUser(Project project, String oldName, String newName) {if (getSubmitter() instanceof SpecifiedUser) {SpecifiedUser specifiedUser = (SpecifiedUser) getSubmitter();if (specifiedUser.getUserName().equals(oldName))specifiedUser.setUserName(newName);}- ReviewRequirement reviewRequirement = getReviewRequirement();- if (reviewRequirement != null) {- for (User user: reviewRequirement.getUsers()) {- if (user.getName().equals(oldName))- user.setName(newName);- }- setReviewRequirementSpec(reviewRequirement.toSpec());+ ReviewRequirement reviewRequirement = ReviewRequirement.parse(project, this.reviewRequirement);+ for (User user: reviewRequirement.getUsers()) {+ if (user.getName().equals(oldName))+ user.setName(newName);}+ setReviewRequirement(reviewRequirement.toString());for (FileProtection fileProtection: getFileProtections()) {- reviewRequirement = fileProtection.getReviewRequirement();+ reviewRequirement = ReviewRequirement.parse(project, fileProtection.getReviewRequirement());for (User user: reviewRequirement.getUsers()) {if (user.getName().equals(oldName))user.setName(newName);}- String spec = reviewRequirement.toSpec();- Preconditions.checkState(spec != null);- fileProtection.setReviewRequirementSpec(spec);+ fileProtection.setReviewRequirement(reviewRequirement.toString());}}- public boolean onDeleteUser(String userName) {+ public boolean onDeleteUser(Project project, String userName) {if (getSubmitter() instanceof SpecifiedUser) {SpecifiedUser specifiedUser = (SpecifiedUser) getSubmitter();if (specifiedUser.getUserName().equals(userName))return true;}- ReviewRequirement reviewRequirement = getReviewRequirement();- if (reviewRequirement != null) {- for (User user: reviewRequirement.getUsers()) {- if (user.getName().equals(userName))- return true;- }+ for (User user: ReviewRequirement.parse(project, this.reviewRequirement).getUsers()) {+ if (user.getName().equals(userName))+ return true;}for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {FileProtection protection = it.next();- reviewRequirement = protection.getReviewRequirement();- for (User user: reviewRequirement.getUsers()) {+ for (User user: ReviewRequirement.parse(project, protection.getReviewRequirement()).getUsers()) {if (user.getName().equals(userName)) {it.remove();break;diff --git a/core/src/main/java/io/onedev/server/model/support/FileProtection.java b/core/src/main/java/io/onedev/server/model/support/FileProtection.javaindex e4c3fba36f..ab8e7ce317 100644--- a/core/src/main/java/io/onedev/server/model/support/FileProtection.java+++ b/core/src/main/java/io/onedev/server/model/support/FileProtection.java@@ -4,10 +4,8 @@ import java.io.Serializable;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.PathPattern;-import io.onedev.server.web.editable.annotation.ReviewRequirementSpec;@Editablepublic class FileProtection implements Serializable {@@ -16,9 +14,7 @@ public class FileProtection implements Serializable {private String path;- private String reviewRequirementSpec;-- private transient ReviewRequirement reviewRequirement;+ private String reviewRequirement;@Editable(order=100, description="Specify path to be protected. Wildcard can be used in the path "+ "to match multiple files")@@ -34,20 +30,14 @@ public class FileProtection implements Serializable {@Editable(order=200, name="Reviewers", description="Optionally specify required reviewers if specified path is "+ "changed. Note that the user submitting the change is considered to reviewed the change automatically")- @ReviewRequirementSpec+ @io.onedev.server.web.editable.annotation.ReviewRequirement@NotEmpty- public String getReviewRequirementSpec() {- return reviewRequirementSpec;+ public String getReviewRequirement() {+ return reviewRequirement;}- public void setReviewRequirementSpec(String reviewRequirementSpec) {- this.reviewRequirementSpec = reviewRequirementSpec;- }-- public ReviewRequirement getReviewRequirement() {- if (reviewRequirement == null)- reviewRequirement = new ReviewRequirement(reviewRequirementSpec);- return reviewRequirement;+ public void setReviewRequirement(String reviewRequirement) {+ this.reviewRequirement = reviewRequirement;}}diff --git a/core/src/main/java/io/onedev/server/model/support/TagProtection.java b/core/src/main/java/io/onedev/server/model/support/TagProtection.javaindex f464362f9f..6b17b39ba4 100644--- a/core/src/main/java/io/onedev/server/model/support/TagProtection.java+++ b/core/src/main/java/io/onedev/server/model/support/TagProtection.java@@ -8,7 +8,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.model.support.ifsubmittedby.Anyone;import io.onedev.server.model.support.ifsubmittedby.IfSubmittedBy;-import io.onedev.server.model.support.ifsubmittedby.SpecifiedGroup;+import io.onedev.server.model.support.ifsubmittedby.SpecifiedTeam;import io.onedev.server.model.support.ifsubmittedby.SpecifiedUser;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.TagPattern;@@ -88,17 +88,17 @@ public class TagProtection implements Serializable {}public void onRenameGroup(String oldName, String newName) {- if (getSubmitter() instanceof SpecifiedGroup) {- SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();- if (specifiedGroup.getGroupName().equals(oldName))- specifiedGroup.setGroupName(newName);+ if (getSubmitter() instanceof SpecifiedTeam) {+ SpecifiedTeam specifiedGroup = (SpecifiedTeam) getSubmitter();+ if (specifiedGroup.getTeamName().equals(oldName))+ specifiedGroup.setTeamName(newName);}}public boolean onDeleteGroup(String groupName) {- if (getSubmitter() instanceof SpecifiedGroup) {- SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();- if (specifiedGroup.getGroupName().equals(groupName))+ if (getSubmitter() instanceof SpecifiedTeam) {+ SpecifiedTeam specifiedGroup = (SpecifiedTeam) getSubmitter();+ if (specifiedGroup.getTeamName().equals(groupName))return true;}return false;diff --git a/core/src/main/java/io/onedev/server/model/support/authorized/ProjectWriters.java b/core/src/main/java/io/onedev/server/model/support/authorized/CodeReaders.javasimilarity index 66%rename from core/src/main/java/io/onedev/server/model/support/authorized/ProjectWriters.javarename to core/src/main/java/io/onedev/server/model/support/authorized/CodeReaders.javaindex 1a05031547..35b9e8e069 100644--- a/core/src/main/java/io/onedev/server/model/support/authorized/ProjectWriters.java+++ b/core/src/main/java/io/onedev/server/model/support/authorized/CodeReaders.java@@ -2,18 +2,18 @@ package io.onedev.server.model.support.authorized;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=100, name="Users with project write permission")-public class ProjectWriters implements Authorized {+@Editable(order=100, name="Users allowed to write code")+public class CodeReaders implements Authorized {private static final long serialVersionUID = 1L;@Overridepublic boolean matches(Project project, User user) {- return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.WRITE));+ return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.CODE_READ));}}diff --git a/core/src/main/java/io/onedev/server/model/support/authorized/ProjectReaders.java b/core/src/main/java/io/onedev/server/model/support/authorized/CodeWriters.javasimilarity index 66%rename from core/src/main/java/io/onedev/server/model/support/authorized/ProjectReaders.javarename to core/src/main/java/io/onedev/server/model/support/authorized/CodeWriters.javaindex 2cb44fde5a..c96f804cfa 100644--- a/core/src/main/java/io/onedev/server/model/support/authorized/ProjectReaders.java+++ b/core/src/main/java/io/onedev/server/model/support/authorized/CodeWriters.java@@ -2,18 +2,18 @@ package io.onedev.server.model.support.authorized;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=50, name="Users able to access the project")-public class ProjectReaders implements Authorized {+@Editable(order=100, name="Users allowed to write code")+public class CodeWriters implements Authorized {private static final long serialVersionUID = 1L;@Overridepublic boolean matches(Project project, User user) {- return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.READ));+ return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.CODE_WRITE));}}diff --git a/core/src/main/java/io/onedev/server/model/support/ifsubmittedby/ProjectAdministrators.java b/core/src/main/java/io/onedev/server/model/support/authorized/IssueReaders.javasimilarity index 58%rename from core/src/main/java/io/onedev/server/model/support/ifsubmittedby/ProjectAdministrators.javarename to core/src/main/java/io/onedev/server/model/support/authorized/IssueReaders.javaindex 0af9f7aa97..b026c6278e 100644--- a/core/src/main/java/io/onedev/server/model/support/ifsubmittedby/ProjectAdministrators.java+++ b/core/src/main/java/io/onedev/server/model/support/authorized/IssueReaders.java@@ -1,19 +1,19 @@-package io.onedev.server.model.support.ifsubmittedby;+package io.onedev.server.model.support.authorized;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=400, name="Project administrators")-public class ProjectAdministrators implements IfSubmittedBy {+@Editable(order=100, name="Users allowed to write code")+public class IssueReaders implements Authorized {private static final long serialVersionUID = 1L;@Overridepublic boolean matches(Project project, User user) {- return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN));+ return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ISSUE_READ));}}diff --git a/core/src/main/java/io/onedev/server/model/support/authorized/ProjectAdministrators.java b/core/src/main/java/io/onedev/server/model/support/authorized/ProjectAdministrators.javaindex 2347bf3fea..3c5ba8fec9 100644--- a/core/src/main/java/io/onedev/server/model/support/authorized/ProjectAdministrators.java+++ b/core/src/main/java/io/onedev/server/model/support/authorized/ProjectAdministrators.java@@ -2,18 +2,18 @@ package io.onedev.server.model.support.authorized;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=400, name="Project administrators")+@Editable(order=100, name="Users allowed to write code")public class ProjectAdministrators implements Authorized {private static final long serialVersionUID = 1L;@Overridepublic boolean matches(Project project, User user) {- return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN));+ return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.PROJECT_ADMINISTRATION));}}diff --git a/core/src/main/java/io/onedev/server/model/support/authorized/SpecifiedGroup.java b/core/src/main/java/io/onedev/server/model/support/authorized/SpecifiedGroup.javadeleted file mode 100644index 2503370099..0000000000--- a/core/src/main/java/io/onedev/server/model/support/authorized/SpecifiedGroup.java+++ /dev/null@@ -1,42 +0,0 @@-package io.onedev.server.model.support.authorized;--import org.hibernate.validator.constraints.NotEmpty;--import com.google.common.base.Preconditions;--import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.model.Group;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.GroupChoice;-import io.onedev.server.web.editable.annotation.OmitName;--@Editable(order=300, name="Group")-public class SpecifiedGroup implements Authorized {-- private static final long serialVersionUID = 1L;-- private String groupName;-- @Editable(name="Group")- @GroupChoice- @OmitName- @NotEmpty- public String getGroupName() {- return groupName;- }-- public void setGroupName(String groupName) {- this.groupName = groupName;- }-- @Override- public boolean matches(Project project, User user) {- GroupManager groupManager = OneDev.getInstance(GroupManager.class);- Group group = Preconditions.checkNotNull(groupManager.find(groupName));- return group.getMembers().contains(user);- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/authorized/SpecifiedTeam.java b/core/src/main/java/io/onedev/server/model/support/authorized/SpecifiedTeam.javanew file mode 100644index 0000000000..4e2eafa6b6--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/authorized/SpecifiedTeam.java@@ -0,0 +1,42 @@+package io.onedev.server.model.support.authorized;++import org.hibernate.validator.constraints.NotEmpty;++import com.google.common.base.Preconditions;++import io.onedev.server.OneDev;+import io.onedev.server.manager.TeamManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;+import io.onedev.server.model.User;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.TeamChoice;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable(order=300, name="Team")+public class SpecifiedTeam implements Authorized {++ private static final long serialVersionUID = 1L;++ private String teamName;++ @Editable(name="Team")+ @TeamChoice+ @OmitName+ @NotEmpty+ public String getTeamName() {+ return teamName;+ }++ public void setTeamName(String teamName) {+ this.teamName = teamName;+ }++ @Override+ public boolean matches(Project project, User user) {+ TeamManager teamManager = OneDev.getInstance(TeamManager.class);+ Team team = Preconditions.checkNotNull(teamManager.find(project, teamName));+ return team.getMembers().contains(user);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/ifsubmittedby/SpecifiedGroup.java b/core/src/main/java/io/onedev/server/model/support/ifsubmittedby/SpecifiedGroup.javadeleted file mode 100644index 94313fcca2..0000000000--- a/core/src/main/java/io/onedev/server/model/support/ifsubmittedby/SpecifiedGroup.java+++ /dev/null@@ -1,42 +0,0 @@-package io.onedev.server.model.support.ifsubmittedby;--import org.hibernate.validator.constraints.NotEmpty;--import com.google.common.base.Preconditions;--import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.model.Group;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.GroupChoice;-import io.onedev.server.web.editable.annotation.OmitName;--@Editable(order=300, name="Group")-public class SpecifiedGroup implements IfSubmittedBy {-- private static final long serialVersionUID = 1L;-- private String groupName;-- @Editable(name="Group")- @GroupChoice- @OmitName- @NotEmpty- public String getGroupName() {- return groupName;- }-- public void setGroupName(String groupName) {- this.groupName = groupName;- }-- @Override- public boolean matches(Project project, User user) {- GroupManager groupManager = OneDev.getInstance(GroupManager.class);- Group group = Preconditions.checkNotNull(groupManager.find(groupName));- return group.getMembers().contains(user);- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/ifsubmittedby/SpecifiedTeam.java b/core/src/main/java/io/onedev/server/model/support/ifsubmittedby/SpecifiedTeam.javanew file mode 100644index 0000000000..ea0339677e--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/ifsubmittedby/SpecifiedTeam.java@@ -0,0 +1,42 @@+package io.onedev.server.model.support.ifsubmittedby;++import org.hibernate.validator.constraints.NotEmpty;++import com.google.common.base.Preconditions;++import io.onedev.server.OneDev;+import io.onedev.server.manager.TeamManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;+import io.onedev.server.model.User;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.TeamChoice;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable(order=300, name="Team")+public class SpecifiedTeam implements IfSubmittedBy {++ private static final long serialVersionUID = 1L;++ private String teamName;++ @Editable(name="Team")+ @TeamChoice+ @OmitName+ @NotEmpty+ public String getTeamName() {+ return teamName;+ }++ public void setTeamName(String teamName) {+ this.teamName = teamName;+ }++ @Override+ public boolean matches(Project project, User user) {+ TeamManager teamManager = OneDev.getInstance(TeamManager.class);+ Team team = Preconditions.checkNotNull(teamManager.find(project, teamName));+ return team.getMembers().contains(user);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.javaindex 5452a2f0bf..cfa893a69e 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java@@ -22,7 +22,7 @@ import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;+import io.onedev.server.util.inputspec.teamchoiceinput.TeamChoiceInput;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -108,7 +108,7 @@ public class IssueBoard implements Serializable {Project project = OneContext.get().getProject();choices.add(IssueConstants.FIELD_STATE);for (InputSpec fieldSpec: project.getIssueWorkflow().getFieldSpecs()) {- if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceInput || fieldSpec instanceof UserChoiceInput || fieldSpec instanceof GroupChoiceInput))+ if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceInput || fieldSpec instanceof UserChoiceInput || fieldSpec instanceof TeamChoiceInput))choices.add(fieldSpec.getName());}return choices;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.javaindex 7ee31e3d1a..5032cd37fa 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.java@@ -7,8 +7,9 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;-import io.onedev.server.model.Group;import io.onedev.server.model.IssueAction;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;import io.onedev.server.model.User;import io.onedev.server.model.support.CommentSupport;import io.onedev.server.model.support.DiffSupport;@@ -25,8 +26,8 @@ public interface ActionData extends Serializable {@NullableCommentSupport getCommentSupport();- Map<String, User> getNewUsers();+ Map<String, User> getNewUsers(Project project);- Map<String, Group> getNewGroups();+ Map<String, Team> getNewTeams(Project project);}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.javaindex d66b4ba810..4e361805dc 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java@@ -9,10 +9,11 @@ import java.util.Map;import org.apache.wicket.Component;import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.manager.TeamManager;import io.onedev.server.manager.UserManager;-import io.onedev.server.model.Group;import io.onedev.server.model.IssueAction;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;import io.onedev.server.model.User;import io.onedev.server.model.support.CommentSupport;import io.onedev.server.model.support.DiffSupport;@@ -31,7 +32,7 @@ public class FieldChangeData implements ActionData {protected final Map<String, String> newUserNames = new HashMap<>();- protected final Map<String, String> newGroupNames = new HashMap<>();+ protected final Map<String, String> newTeamNames = new HashMap<>();public FieldChangeData(Map<String, IssueField> oldFields, Map<String, IssueField> newFields) {oldFields = copyNonEmptyFields(oldFields);@@ -72,8 +73,8 @@ public class FieldChangeData implements ActionData {private void extractUsersAndGroups(IssueField field) {if (field.getType().equals(InputSpec.USER) && !field.getValues().isEmpty())newUserNames.put(field.getName(), field.getValues().iterator().next());- if (field.getType().equals(InputSpec.GROUP) && !field.getValues().isEmpty())- newGroupNames.put(field.getName(), field.getValues().iterator().next());+ if (field.getType().equals(InputSpec.TEAM) && !field.getValues().isEmpty())+ newTeamNames.put(field.getName(), field.getValues().iterator().next());}private String describe(IssueField field) {@@ -132,7 +133,7 @@ public class FieldChangeData implements ActionData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, User> getNewUsers(Project project) {Map<String, User> newUsers = new HashMap<>();for (Map.Entry<String, String> entry: newUserNames.entrySet()) {User user = OneDev.getInstance(UserManager.class).findByName(entry.getValue());@@ -143,14 +144,14 @@ public class FieldChangeData implements ActionData {}@Override- public Map<String, Group> getNewGroups() {- Map<String, Group> newGroups = new HashMap<>();- for (Map.Entry<String, String> entry: newGroupNames.entrySet()) {- Group group = OneDev.getInstance(GroupManager.class).find(entry.getValue());- if (group != null)- newGroups.put(entry.getKey(), group);+ public Map<String, Team> getNewTeams(Project project) {+ Map<String, Team> newTeams = new HashMap<>();+ for (Map.Entry<String, String> entry: newTeamNames.entrySet()) {+ Team team = OneDev.getInstance(TeamManager.class).find(project, entry.getValue());+ if (team != null)+ newTeams.put(entry.getKey(), team);}- return newGroups;+ return newTeams;}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.javaindex e626a9e562..ba1d00c15d 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java@@ -9,9 +9,10 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;-import io.onedev.server.model.Group;import io.onedev.server.model.IssueAction;import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;import io.onedev.server.model.User;import io.onedev.server.model.support.CommentSupport;import io.onedev.server.model.support.DiffSupport;@@ -101,12 +102,12 @@ public class MilestoneChangeData implements ActionData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, User> getNewUsers(Project project) {return new HashMap<>();}@Override- public Map<String, Group> getNewGroups() {+ public Map<String, Team> getNewTeams(Project project) {return new HashMap<>();}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.javaindex 2974405318..e9e199fd2c 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.java@@ -6,8 +6,9 @@ import java.util.Map;import org.apache.wicket.Component;-import io.onedev.server.model.Group;import io.onedev.server.model.IssueAction;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;import io.onedev.server.model.User;import io.onedev.server.model.support.CommentSupport;import io.onedev.server.model.support.DiffSupport;@@ -72,12 +73,12 @@ public class TitleChangeData implements ActionData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, User> getNewUsers(Project project) {return new HashMap<>();}@Override- public Map<String, Group> getNewGroups() {+ public Map<String, Team> getNewTeams(Project project) {return new HashMap<>();}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.javaindex e9fda2a5dd..6bdbb1452e 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java@@ -14,7 +14,7 @@ import javax.annotation.Nullable;import com.google.common.collect.Lists;import io.onedev.server.exception.OneException;-import io.onedev.server.model.support.authorized.ProjectWriters;+import io.onedev.server.model.support.authorized.CodeWriters;import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueIsEmpty;import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueIsNotEmpty;@@ -112,7 +112,7 @@ public class IssueWorkflow implements Serializable {fieldSpecs.add(priority);UserChoiceInput assignee = new UserChoiceInput();- assignee.setChoiceProvider(new io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ProjectWriters());+ assignee.setChoiceProvider(new io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.CodeWriters());assignee.setName("Assignee");fieldSpecs.add(assignee);@@ -182,7 +182,7 @@ public class IssueWorkflow implements Serializable {transition.setToState("Assigned");PressButtonTrigger pressButton = new PressButtonTrigger();pressButton.setButtonLabel("Assign");- pressButton.setAuthorized(new ProjectWriters());+ pressButton.setAuthorized(new CodeWriters());pressButton.setPromptFields(Lists.newArrayList("Assignee"));transition.setTrigger(pressButton);@@ -193,7 +193,7 @@ public class IssueWorkflow implements Serializable {transition.setToState("Closed");pressButton = new PressButtonTrigger();pressButton.setButtonLabel("Close");- pressButton.setAuthorized(new ProjectWriters());+ pressButton.setAuthorized(new CodeWriters());pressButton.setPromptFields(Lists.newArrayList("Resolution", "Duplicate With"));transition.setTrigger(pressButton);@@ -208,7 +208,7 @@ public class IssueWorkflow implements Serializable {pressButton = new PressButtonTrigger();pressButton.setButtonLabel("Reopen");transition.setRemoveFields(Lists.newArrayList("Resolution", "Duplicate With"));- pressButton.setAuthorized(new ProjectWriters());+ pressButton.setAuthorized(new CodeWriters());transition.setTrigger(pressButton);transitionSpecs.add(transition);@@ -222,7 +222,7 @@ public class IssueWorkflow implements Serializable {pressButton = new PressButtonTrigger();pressButton.setButtonLabel("Reopen");transition.setRemoveFields(Lists.newArrayList("Resolution", "Duplicate With"));- pressButton.setAuthorized(new ProjectWriters());+ pressButton.setAuthorized(new CodeWriters());transition.setTrigger(pressButton);transitionSpecs.add(transition);diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.javaindex f0880392e4..937aeede4b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java@@ -11,7 +11,7 @@ import javax.validation.constraints.Size;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.model.Issue;-import io.onedev.server.model.support.authorized.SpecifiedGroup;+import io.onedev.server.model.support.authorized.SpecifiedTeam;import io.onedev.server.model.support.authorized.SpecifiedUser;import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;@@ -167,10 +167,10 @@ public class TransitionSpec implements Serializable {TransitionTrigger trigger = getTrigger();if (trigger instanceof PressButtonTrigger) {PressButtonTrigger pressButton = (PressButtonTrigger) trigger;- if (pressButton.getAuthorized() instanceof SpecifiedGroup) {- SpecifiedGroup specifiedGroup = (SpecifiedGroup) pressButton.getAuthorized();- if (specifiedGroup.getGroupName().equals(oldName))- specifiedGroup.setGroupName(newName);+ if (pressButton.getAuthorized() instanceof SpecifiedTeam) {+ SpecifiedTeam specifiedGroup = (SpecifiedTeam) pressButton.getAuthorized();+ if (specifiedGroup.getTeamName().equals(oldName))+ specifiedGroup.setTeamName(newName);}}}@@ -179,9 +179,9 @@ public class TransitionSpec implements Serializable {TransitionTrigger trigger = getTrigger();if (trigger instanceof PressButtonTrigger) {PressButtonTrigger pressButton = (PressButtonTrigger) trigger;- if (pressButton.getAuthorized() instanceof SpecifiedGroup) {- SpecifiedGroup specifiedGroup = (SpecifiedGroup) pressButton.getAuthorized();- if (specifiedGroup.getGroupName().equals(groupName))+ if (pressButton.getAuthorized() instanceof SpecifiedTeam) {+ SpecifiedTeam specifiedGroup = (SpecifiedTeam) pressButton.getAuthorized();+ if (specifiedGroup.getTeamName().equals(groupName))return true;}}diff --git a/core/src/main/java/io/onedev/server/rest/BuildResource.java b/core/src/main/java/io/onedev/server/rest/BuildResource.javaindex c0d0b9eb34..b0859ca0db 100644--- a/core/src/main/java/io/onedev/server/rest/BuildResource.java+++ b/core/src/main/java/io/onedev/server/rest/BuildResource.java@@ -35,14 +35,14 @@ public class BuildResource {@Path("/{buildId}")public Build get(@PathParam("buildId") Long buildId) {Build build = buildManager.load(buildId);- if (!SecurityUtils.canRead(build.getConfiguration().getProject()))+ if (!SecurityUtils.canReadCode(build.getConfiguration().getProject().getFacade()))throw new UnauthorizedException();return build;}@POSTpublic void save(@NotNull(message="may not be empty") @Valid Build build) {- if (!SecurityUtils.canWrite(build.getConfiguration().getProject()))+ if (!SecurityUtils.canWriteCode(build.getConfiguration().getProject().getFacade()))throw new UnauthorizedException();buildManager.save(build);diff --git a/core/src/main/java/io/onedev/server/rest/ProjectResource.java b/core/src/main/java/io/onedev/server/rest/ProjectResource.javaindex 235706b781..ca3fa14a5c 100644--- a/core/src/main/java/io/onedev/server/rest/ProjectResource.java+++ b/core/src/main/java/io/onedev/server/rest/ProjectResource.java@@ -55,7 +55,7 @@ public class ProjectResource {Collection<Project> projects = projectManager.findRange(criteria, (page-1)*perPage, perPage);for (Project project: projects) {- if (!SecurityUtils.canRead(project))+ if (!SecurityUtils.canReadIssues(project.getFacade()))throw new UnauthorizedException("Unable to access project '" + project.getName() + "'");}@@ -70,7 +70,7 @@ public class ProjectResource {@GETpublic Project get(@PathParam("projectId") Long projectId) {Project project = projectManager.load(projectId);- if (!SecurityUtils.canRead(project))+ if (!SecurityUtils.canReadIssues(project.getFacade()))throw new UnauthorizedException("Unauthorized access to project " + project.getName());elsereturn project;diff --git a/core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/core/src/main/java/io/onedev/server/rest/PullRequestResource.javaindex 886b954724..a849d8a4cf 100644--- a/core/src/main/java/io/onedev/server/rest/PullRequestResource.java+++ b/core/src/main/java/io/onedev/server/rest/PullRequestResource.java@@ -46,7 +46,7 @@ public class PullRequestResource {@GETpublic PullRequest get(@PathParam("pullRequestId") Long pullRequestId) {PullRequest request = pullRequestManager.load(pullRequestId);- if (!SecurityUtils.canRead(request.getTargetProject()))+ if (!SecurityUtils.canReadCode(request.getTargetProject().getFacade()))throw new UnauthorizedException();return request;}@@ -98,7 +98,7 @@ public class PullRequestResource {Collection<PullRequest> requests = pullRequestManager.findRange(criteria, (page-1)*perPage, perPage);for (PullRequest request: requests) {- if (!SecurityUtils.canRead(request.getTargetProject())) {+ if (!SecurityUtils.canReadCode(request.getTargetProject().getFacade())) {throw new UnauthorizedException("Unable to access pull requests of project '"+ request.getTargetProject() + "'");}diff --git a/core/src/main/java/io/onedev/server/rest/ReviewResource.java b/core/src/main/java/io/onedev/server/rest/ReviewResource.javaindex 0ccfac6c36..2923282832 100644--- a/core/src/main/java/io/onedev/server/rest/ReviewResource.java+++ b/core/src/main/java/io/onedev/server/rest/ReviewResource.java@@ -51,7 +51,7 @@ public class ReviewResource {@Path("/{id}")public PullRequestReview get(@PathParam("id") Long id) {PullRequestReview review = reviewManager.load(id);- if (!SecurityUtils.canRead(review.getRequest().getTargetProject()))+ if (!SecurityUtils.canReadCode(review.getRequest().getTargetProject().getFacade()))throw new UnauthorizedException();return review;}@@ -61,7 +61,7 @@ public class ReviewResource {public void delete(@PathParam("id") Long id) {PullRequestReview review = reviewManager.load(id);User currentUser = userManager.getCurrent();- if (review.getUser().equals(currentUser) || SecurityUtils.canManage(review.getRequest().getTargetProject()))+ if (review.getUser().equals(currentUser) || SecurityUtils.canWriteCode(review.getRequest().getTargetProject().getFacade()))reviewManager.delete(review);elsethrow new UnauthorizedException();@@ -90,7 +90,7 @@ public class ReviewResource {Collection<PullRequestReview> reviews = reviewManager.findRange(criteria, (page-1)*perPage, perPage);for (PullRequestReview review: reviews) {- if (!SecurityUtils.canRead(review.getRequest().getTargetProject())) {+ if (!SecurityUtils.canReadCode(review.getRequest().getTargetProject().getFacade())) {throw new UnauthorizedException("Unable to access pull request reviews of project '"+ review.getRequest().getTargetProject().getName() + "'");}@@ -105,7 +105,7 @@ public class ReviewResource {@Transactional@POSTpublic Long save(@NotNull(message="may not be empty") @Valid PullRequestReview review) {- if (!SecurityUtils.canRead(review.getRequest().getTargetProject())+ if (!SecurityUtils.canReadCode(review.getRequest().getTargetProject().getFacade())|| !review.getUser().equals(userManager.getCurrent()) && !SecurityUtils.isAdministrator()) {throw new UnauthorizedException();}diff --git a/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java b/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.javaindex 0ff2cd1131..e2790199f5 100644--- a/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java+++ b/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java@@ -69,7 +69,7 @@ public class CommitStatusResource {Map<String, String> commitStatus, @Context UriInfo uriInfo) {Project project = getProject(projectName);- if (!SecurityUtils.canWrite(project))+ if (!SecurityUtils.canWriteCode(project.getFacade()))throw new UnauthorizedException();String context = commitStatus.get("context");diff --git a/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java b/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.javaindex 55de0d2efd..c533cbfffa 100644--- a/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java+++ b/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java@@ -62,7 +62,7 @@ public class PullRequestResource {@PathParam("pullRequestNumber") Long pullRequestNumber, @Context UriInfo uriInfo) {Project project = getProject(projectName);- if (!SecurityUtils.canRead(project))+ if (!SecurityUtils.canReadCode(project.getFacade()))throw new UnauthorizedException("Unauthorized access to project '" + projectName + "'");PullRequest request = Preconditions.checkNotNull(pullRequestManager.find(project, pullRequestNumber));@@ -77,7 +77,7 @@ public class PullRequestResource {@PathParam("pullRequestNumber") Long pullRequestNumber) {Project project = getProject(projectName);- if (!SecurityUtils.canRead(project))+ if (!SecurityUtils.canReadCode(project.getFacade()))throw new UnauthorizedException("Unauthorized access to project '" + projectName + "'");PullRequest request = pullRequestManager.find(project, pullRequestNumber);@@ -189,7 +189,7 @@ public class PullRequestResource {@QueryParam("page") Integer page, @Context UriInfo uriInfo) {Project project = getProject(projectName);- if (!SecurityUtils.canRead(project))+ if (!SecurityUtils.canReadCode(project.getFacade()))throw new UnauthorizedException("Unauthorized access to project '" + projectName + "'");EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);diff --git a/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.java b/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.javaindex bc0c6764a6..73976df0fa 100644--- a/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.java+++ b/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.java@@ -38,14 +38,14 @@ public class RepositoryResource {public Response get(@PathParam("name") String name) {Project project = projectManager.find(name);- if (!SecurityUtils.canRead(project)) {+ if (!SecurityUtils.canReadCode(project.getFacade())) {throw new UnauthorizedException("Unauthorized access to project " + project.getName());} else {Map<String, Object> entity = new HashMap<>();Map<String, String> permissionsMap = new HashMap<>();entity.put("name", project.getName());- permissionsMap.put("admin", String.valueOf(SecurityUtils.canManage(project)));- permissionsMap.put("push", String.valueOf(SecurityUtils.canWrite(project)));+ permissionsMap.put("admin", String.valueOf(SecurityUtils.canAdministrate(project.getFacade())));+ permissionsMap.put("push", String.valueOf(SecurityUtils.canWriteCode(project.getFacade())));permissionsMap.put("pull", "true");entity.put("permissions", permissionsMap);diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 4b2ddb26d6..a2cef5741f 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -60,8 +60,8 @@ import io.onedev.server.util.inputspec.PullRequestChoiceInput;import io.onedev.server.util.inputspec.booleaninput.BooleanInput;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.dateinput.DateInput;-import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;import io.onedev.server.util.inputspec.numberinput.NumberInput;+import io.onedev.server.util.inputspec.teamchoiceinput.TeamChoiceInput;import io.onedev.server.util.inputspec.textinput.TextInput;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;@@ -268,7 +268,7 @@ public class IssueQuery extends EntityQuery<Issue> {long ordinal = getValueOrdinal((ChoiceInput) field, value);return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);} else if (field instanceof UserChoiceInput- || field instanceof GroupChoiceInput) {+ || field instanceof TeamChoiceInput) {return new ChoiceFieldCriteria(fieldName, value, -1, operator, false);} else {return new StringFieldCriteria(fieldName, value, operator);@@ -396,7 +396,7 @@ public class IssueQuery extends EntityQuery<Issue> {&& !(fieldSpec instanceof NumberInput)&& !(fieldSpec instanceof ChoiceInput)&& !(fieldSpec instanceof UserChoiceInput)- && !(fieldSpec instanceof GroupChoiceInput)+ && !(fieldSpec instanceof TeamChoiceInput)&& !(fieldSpec instanceof TextInput)) {throw newOperatorException(fieldName, operator);}diff --git a/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex ce9d235f4a..710ce7b687 100644--- a/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -24,11 +24,11 @@ import org.slf4j.LoggerFactory;import io.onedev.launcher.loader.AppLoader;import io.onedev.server.manager.CacheManager;import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.manager.TeamManager;import io.onedev.server.manager.MembershipManager;import io.onedev.server.manager.UserManager;-import io.onedev.server.model.Group;import io.onedev.server.model.Membership;+import io.onedev.server.model.Team;import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -36,13 +36,11 @@ import io.onedev.server.security.authenticator.Authenticated;import io.onedev.server.security.authenticator.Authenticator;import io.onedev.server.security.permission.CreateProjects;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.PublicPermission;import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.security.permission.UserAdministration;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;+import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.util.facade.TeamFacade;import io.onedev.server.util.facade.UserFacade;import io.onedev.utils.StringUtils;@@ -61,11 +59,11 @@ public class OneAuthorizingRealm extends AuthorizingRealm {private final MembershipManager membershipManager;- private final GroupManager groupManager;+ private final TeamManager teamManager;@Injectpublic OneAuthorizingRealm(UserManager userManager, CacheManager cacheManager, SettingManager configManager,- MembershipManager membershipManager, GroupManager groupManager) {+ MembershipManager membershipManager, TeamManager teamManager) {PasswordMatcher passwordMatcher = new PasswordMatcher();passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));setCredentialsMatcher(passwordMatcher);@@ -74,9 +72,18 @@ public class OneAuthorizingRealm extends AuthorizingRealm {this.cacheManager = cacheManager;this.configManager = configManager;this.membershipManager = membershipManager;- this.groupManager = groupManager;+ this.teamManager = teamManager;}+ private Collection<Permission> getDefaultPermissions() {+ Collection<Permission> defaultPermissions = new ArrayList<>();+ for (ProjectFacade project: cacheManager.getProjects().values()) {+ if (project.getDefaultPrivilege() != null)+ defaultPermissions.add(new ProjectPermission(project, project.getDefaultPrivilege()));+ }+ return defaultPermissions;+ }+@Sessionalprotected Collection<Permission> getObjectPermissionsInSession(Long userId) {Collection<Permission> permissions = new ArrayList<>();@@ -85,36 +92,20 @@ public class OneAuthorizingRealm extends AuthorizingRealm {if (userId != 0L)user = cacheManager.getUser(userId);if (user != null) {- permissions.add(new PublicPermission());- if (user.isRoot())+ permissions.addAll(getDefaultPermissions());+ if (user.isRoot() || user.isAdministrator())permissions.add(new SystemAdministration());+ if (user.isCanCreateProjects())+ permissions.add(new CreateProjects());permissions.add(new UserAdministration(user));for (MembershipFacade membership: cacheManager.getMemberships().values()) {if (membership.getUserId().equals(userId)) {- GroupFacade group = cacheManager.getGroup(membership.getGroupId());- if (group.isAdministrator())- permissions.add(new SystemAdministration());- if (group.isCanCreateProjects())- permissions.add(new CreateProjects());- for (GroupAuthorizationFacade authorization:- cacheManager.getGroupAuthorizations().values()) {- if (authorization.getGroupId().equals(group.getId())) {- permissions.add(new ProjectPermission(- cacheManager.getProject(authorization.getProjectId()),- authorization.getPrivilege()));- }- }- }- }- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getUserId().equals(userId)) {- permissions.add(new ProjectPermission(- cacheManager.getProject(authorization.getProjectId()),- authorization.getPrivilege()));+ TeamFacade team = cacheManager.getTeam(membership.getTeamId());+ permissions.add(new ProjectPermission(cacheManager.getProject(team.getProjectId()), team.getPrivilege()));}}} else if (configManager.getSecuritySetting().isEnableAnonymousAccess()) {- permissions.add(new PublicPermission());+ permissions.addAll(getDefaultPermissions());}return permissions;}@@ -170,30 +161,32 @@ public class OneAuthorizingRealm extends AuthorizingRealm {if (authenticated.getFullName() != null)user.setFullName(authenticated.getFullName());- Collection<String> existingGroupNames = new HashSet<>();- for (Membership membership: user.getMemberships())- existingGroupNames.add(membership.getGroup().getName());- if (!authenticated.getGroupNames().isEmpty()) {- Collection<String> retrievedGroupNames = new HashSet<>();- for (String groupName: authenticated.getGroupNames()) {- Group group = groupManager.find(groupName);- if (group != null) {- if (!existingGroupNames.contains(groupName)) {+ Collection<String> existingTeamFQNs = new HashSet<>();+ for (Membership membership: user.getMemberships()) {+ Team team = membership.getTeam();+ existingTeamFQNs.add(team.getFQN());+ }+ if (!authenticated.getTeamFQNs().isEmpty()) {+ Collection<String> retrievedTeamFQNs = new HashSet<>();+ for (String teamFQN: authenticated.getTeamFQNs()) {+ Team team = teamManager.findByFQN(teamFQN);+ if (team != null) {+ if (!existingTeamFQNs.contains(teamFQN)) {Membership membership = new Membership();- membership.setGroup(group);+ membership.setTeam(team);membership.setUser(user);membershipManager.save(membership);user.getMemberships().add(membership);- existingGroupNames.add(groupName);+ existingTeamFQNs.add(teamFQN);}- retrievedGroupNames.add(groupName);+ retrievedTeamFQNs.add(teamFQN);} else {- logger.debug("Group '{}' from external authenticator is not defined", groupName);+ logger.debug("Team '{}' from external authenticator is not defined", teamFQN);}}for (Iterator<Membership> it = user.getMemberships().iterator(); it.hasNext();) {Membership membership = it.next();- if (!retrievedGroupNames.contains(membership.getGroup().getName())) {+ if (!retrievedTeamFQNs.contains(membership.getTeam().getFQN())) {it.remove();membershipManager.delete(membership);}@@ -209,20 +202,6 @@ public class OneAuthorizingRealm extends AuthorizingRealm {if (authenticated.getFullName() != null)user.setFullName(authenticated.getFullName());userManager.save(user);- if (authenticated.getGroupNames().isEmpty()) {- for (String groupName: authenticator.getDefaultGroupNames()) {- Group group = groupManager.find(groupName);- if (group != null) {- Membership membership = new Membership();- membership.setGroup(group);- membership.setUser(user);- user.getMemberships().add(membership);- membershipManager.save(membership);- } else {- logger.warn("Default group '{}' of external authenticator is not defined", groupName);- }- }- }}} else {user = null;diff --git a/core/src/main/java/io/onedev/server/security/ProjectPrivilege.java b/core/src/main/java/io/onedev/server/security/ProjectPrivilege.javadeleted file mode 100644index 63680d6cc6..0000000000--- a/core/src/main/java/io/onedev/server/security/ProjectPrivilege.java+++ /dev/null@@ -1,43 +0,0 @@-package io.onedev.server.security;--public enum ProjectPrivilege {-- READ("Read") {-- @Override- public boolean implies(ProjectPrivilege privilege) {- return privilege == READ;- }-- },- WRITE("Write") {-- @Override- public boolean implies(ProjectPrivilege privilege) {- return privilege == WRITE || READ.implies(privilege);- }-- },- ADMIN("Admin") {-- @Override- public boolean implies(ProjectPrivilege privilege) {- return true;- }-- };-- public abstract boolean implies(ProjectPrivilege privilege);-- private final String displayName;-- ProjectPrivilege(String displayName) {- this.displayName = displayName;- }-- @Override- public String toString() {- return displayName;- }--}diff --git a/core/src/main/java/io/onedev/server/security/SecurityUtils.java b/core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex fdaed245a9..c4f34596ef 100644--- a/core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -2,7 +2,7 @@ package io.onedev.server.security;import java.util.Collection;import java.util.HashSet;-import java.util.Set;+import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -19,149 +19,61 @@ import io.onedev.server.model.IssueAction;import io.onedev.server.model.IssueComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.PullRequestAction;-import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;import io.onedev.server.security.permission.CreateProjects;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.PublicPermission;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.security.permission.UserAdministration;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.util.facade.MembershipFacade;import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;+import io.onedev.server.util.facade.TeamFacade;import io.onedev.server.util.facade.UserFacade;public class SecurityUtils extends org.apache.shiro.SecurityUtils {public static Collection<UserFacade> getAuthorizedUsers(ProjectFacade project, ProjectPrivilege privilege) {- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);Collection<UserFacade> authorizedUsers = new HashSet<>();- if (project.isPublicRead() && privilege == ProjectPrivilege.READ) {- for (UserFacade user: cacheManager.getUsers().values())- authorizedUsers.add(user);+ CacheManager cacheManager = OneDev.getInstance(CacheManager.class);+ if (project.getDefaultPrivilege() != null && project.getDefaultPrivilege().implies(privilege)) {+ authorizedUsers.addAll(cacheManager.getUsers().values());} else {- authorizedUsers.add(OneDev.getInstance(UserManager.class).getRoot().getFacade());-- Set<Long> authorizedGroupIds = new HashSet<>();- for (GroupFacade group: cacheManager.getGroups().values()) {- if (group.isAdministrator())- authorizedGroupIds.add(group.getId());- }- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (authorization.getProjectId().equals(project.getId()) && authorization.getPrivilege().implies(privilege))- authorizedGroupIds.add(authorization.getGroupId());+ for (UserFacade user: cacheManager.getUsers().values()) {+ if (user.isRoot() || user.isAdministrator())+ authorizedUsers.add(user);}++ Collection<Long> authorizedTeamIds =+ getAuthorizedTeams(project, privilege).stream().map(it->it.getId()).collect(Collectors.toSet());for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (authorizedGroupIds.contains(membership.getGroupId()))+ if (authorizedTeamIds.contains(membership.getTeamId()))authorizedUsers.add(cacheManager.getUser(membership.getUserId()));}-- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getProjectId().equals(project.getId())- && authorization.getPrivilege().implies(privilege)) {- authorizedUsers.add(cacheManager.getUser(authorization.getUserId()));- }- }}-+return authorizedUsers;}-- public static boolean canModify(PullRequest request) {- Project project = request.getTargetProject();- if (canManage(project)) {- return true;- } else {- User currentUser = getUser();- return currentUser != null && currentUser.equals(request.getSubmitter());++ public static Collection<TeamFacade> getAuthorizedTeams(ProjectFacade project, ProjectPrivilege privilege) {+ CacheManager cacheManager = OneDev.getInstance(CacheManager.class);+ Collection<TeamFacade> authorizedTeams = new HashSet<>();+ for (TeamFacade team: cacheManager.getTeams().values()) {+ if (team.getProjectId().equals(project.getId()) && team.getPrivilege().implies(privilege))+ authorizedTeams.add(team);}+ return authorizedTeams;}- public static boolean canModify(Issue issue) {- Project project = issue.getProject();- if (canManage(project)) {- return true;- } else {- User currentUser = getUser();- return currentUser != null && currentUser.equals(issue.getSubmitter());- }- }-public static User getUser() {return OneDev.getInstance(UserManager.class).getCurrent();}- public static boolean canModify(PullRequestReview review) {- Project project = review.getRequest().getTargetProject();- if (canManage(project)) {- return true;- } else {- return review.getUser().equals(getUser());- }- }-- public static boolean canModify(CodeComment comment) {- User currentUser = getUser();- if (currentUser == null) {- return false;- } else {- return currentUser.equals(comment.getUser()) || canManage(comment.getProject());- }- }-- public static boolean canModify(CodeCommentReply reply) {- User currentUser = getUser();- if (currentUser == null) {- return false;- } else {- return currentUser.equals(reply.getUser()) || canManage(reply.getComment().getProject());- }- }-- public static boolean canModify(PullRequestComment comment) {- User currentUser = getUser();- if (currentUser == null) {- return false;- } else {- return currentUser.equals(comment.getUser()) || canManage(comment.getRequest().getTargetProject());- }- }-- public static boolean canModify(IssueComment comment) {- User currentUser = getUser();- if (currentUser == null) {- return false;- } else {- return currentUser.equals(comment.getUser()) || canManage(comment.getIssue().getProject());- }- }-- public static boolean canModify(PullRequestAction action) {- User currentUser = getUser();- if (currentUser == null) {- return false;- } else {- return currentUser.equals(action.getUser()) || canModify(action.getRequest());- }- }-- public static boolean canModify(IssueAction action) {- User currentUser = getUser();- if (currentUser == null) {- return false;- } else {- return currentUser.equals(action.getUser()) || canModify(action.getIssue());- }- }-public static boolean canDeleteBranch(Project project, String branchName) {- if (canWrite(project)) {+ if (canWriteCode(project.getFacade())) {BranchProtection protection = project.getBranchProtection(branchName, getUser());return protection == null || !protection.isNoDeletion();} else {@@ -171,7 +83,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {@Nullablepublic static boolean canCreateTag(Project project, String tagName) {- if (canWrite(project)) {+ if (canWriteCode(project.getFacade())) {TagProtection protection = project.getTagProtection(tagName, getUser());return protection == null || !protection.isNoCreation();} else {@@ -181,7 +93,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {@Nullablepublic static boolean canCreateBranch(Project project, String branchName) {- if (canWrite(project)) {+ if (canWriteCode(project.getFacade())) {BranchProtection protection = project.getBranchProtection(branchName, getUser());return protection == null || !protection.isNoCreation();} else {@@ -190,20 +102,16 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static boolean canModify(Project project, String branch, String file) {- return canWrite(project) && !OneDev.getInstance(ProjectManager.class)+ return canWriteCode(project.getFacade()) && !OneDev.getInstance(ProjectManager.class).isModificationNeedsQualityCheck(getUser(), project, branch, file);}public static boolean canPush(Project project, String branchName, ObjectId oldObjectId, ObjectId newObjectId) {- return canWrite(project) && !OneDev.getInstance(ProjectManager.class)+ return canWriteCode(project.getFacade()) && !OneDev.getInstance(ProjectManager.class).isPushNeedsQualityCheck(getUser(), project, branchName, oldObjectId, newObjectId, null);}- public static boolean canManage(User user) {- return canManage(user.getFacade());- }-- public static boolean canManage(UserFacade user) {+ public static boolean canAdministrate(UserFacade user) {return getSubject().isPermitted(new UserAdministration(user));}@@ -211,36 +119,72 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {return getSubject().isPermitted(new CreateProjects());}- public static boolean canAccessPublic() {- return getSubject().isPermitted(new PublicPermission());+ public static boolean canReadIssues(ProjectFacade project) {+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ISSUE_READ));}- public static boolean canRead(Project project) {- return canRead(project.getFacade());+ public static boolean canReadCode(ProjectFacade project) {+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.CODE_READ));}- public static boolean canRead(ProjectFacade project) {- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.READ));+ public static boolean canWriteCode(ProjectFacade project) {+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.CODE_WRITE));}- public static boolean canWrite(Project project) {- return canWrite(project.getFacade());+ public static boolean canAdministrate(ProjectFacade project) {+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.PROJECT_ADMINISTRATION));}-- public static boolean canWrite(ProjectFacade project) {- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.WRITE));++ public static boolean isAdministrator() {+ return getSubject().isPermitted(new SystemAdministration());}- public static boolean canManage(Project project) {- return canManage(project.getFacade());+ public static boolean canModifyOrDelete(CodeComment comment) {+ User user = SecurityUtils.getUser();+ return user != null && user.equals(comment.getUser())+ || canWriteCode(comment.getProject().getFacade());}- public static boolean canManage(ProjectFacade project) {- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ADMIN));+ public static boolean canModifyOrDelete(CodeCommentReply reply) {+ User user = SecurityUtils.getUser();+ return user != null && user.equals(reply.getUser())+ || canWriteCode(reply.getComment().getProject().getFacade());}- public static boolean isAdministrator() {- return getSubject().isPermitted(new SystemAdministration());+ public static boolean canModifyOrDelete(PullRequestComment comment) {+ User user = SecurityUtils.getUser();+ return user != null && user.equals(comment.getUser())+ || canWriteCode(comment.getRequest().getTargetProject().getFacade());+ }++ public static boolean canModifyOrDelete(IssueComment comment) {+ User user = SecurityUtils.getUser();+ return user != null && user.equals(comment.getUser())+ || canWriteCode(comment.getIssue().getProject().getFacade());+ }++ public static boolean canModifyOrDelete(PullRequestAction action) {+ User user = SecurityUtils.getUser();+ return user != null && user.equals(action.getUser())+ || canWriteCode(action.getRequest().getTargetProject().getFacade());+ }++ public static boolean canModifyOrDelete(IssueAction action) {+ User user = SecurityUtils.getUser();+ return user != null && user.equals(action.getUser())+ || canWriteCode(action.getIssue().getProject().getFacade());+ }++ public static boolean canModify(PullRequest request) {+ User user = SecurityUtils.getUser();+ return user != null && user.equals(request.getSubmitter())+ || canWriteCode(request.getTargetProject().getFacade());+ }++ public static boolean canModify(Issue issue) {+ User user = SecurityUtils.getUser();+ return user != null && user.equals(issue.getSubmitter())+ || canWriteCode(issue.getProject().getFacade());}}diff --git a/core/src/main/java/io/onedev/server/security/authenticator/Authenticated.java b/core/src/main/java/io/onedev/server/security/authenticator/Authenticated.javaindex c519a46112..61d5f17f18 100644--- a/core/src/main/java/io/onedev/server/security/authenticator/Authenticated.java+++ b/core/src/main/java/io/onedev/server/security/authenticator/Authenticated.java@@ -10,12 +10,12 @@ public class Authenticated {private final String email;- private final Collection<String> groupNames;+ private final Collection<String> teamFQNs;- public Authenticated(@Nullable String fullName, @Nullable String email, Collection<String> groupNames) {+ public Authenticated(@Nullable String fullName, @Nullable String email, Collection<String> teamFQNs) {this.fullName = fullName;this.email = email;- this.groupNames = groupNames;+ this.teamFQNs = teamFQNs;}@Nullable@@ -28,8 +28,8 @@ public class Authenticated {return email;}- public Collection<String> getGroupNames() {- return groupNames;+ public Collection<String> getTeamFQNs() {+ return teamFQNs;}}diff --git a/core/src/main/java/io/onedev/server/security/authenticator/Authenticator.java b/core/src/main/java/io/onedev/server/security/authenticator/Authenticator.javaindex c112083fc0..799f72171a 100644--- a/core/src/main/java/io/onedev/server/security/authenticator/Authenticator.java+++ b/core/src/main/java/io/onedev/server/security/authenticator/Authenticator.java@@ -1,23 +1,21 @@package io.onedev.server.security.authenticator;import java.io.Serializable;-import java.util.List;import org.apache.shiro.authc.AuthenticationException;import org.apache.shiro.authc.UsernamePasswordToken;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.GroupChoice;@Editablepublic abstract class Authenticator implements Serializable {private static final long serialVersionUID = 1L;- private List<String> defaultGroupNames;-private int timeout = 300;-++ private boolean canCreateProjects;+@Editable(order=10000, description="Specify network timeout in seconds when authenticate through this system")public int getTimeout() {return timeout;@@ -27,27 +25,15 @@ public abstract class Authenticator implements Serializable {this.timeout = timeout;}- @Editable(order=20000, description="Optionally add newly authenticated user to specified groups if group "- + "information is not available in external authentication system")- @GroupChoice- public List<String> getDefaultGroupNames() {- return defaultGroupNames;+ @Editable(order=20000, description="Check this if authenticated users are allowed to create projects")+ public boolean isCanCreateProjects() {+ return canCreateProjects;}- public void setDefaultGroupNames(List<String> defaultGroupNames) {- this.defaultGroupNames = defaultGroupNames;+ public void setCanCreateProjects(boolean canCreateProjects) {+ this.canCreateProjects = canCreateProjects;}- public void onRenameGroup(String oldName, String newName) {- int index = defaultGroupNames.indexOf(oldName);- if (index != -1)- defaultGroupNames.set(index, newName);- }-- public void onDeleteGroup(String groupName) {- defaultGroupNames.remove(groupName);- }-public abstract Authenticated authenticate(UsernamePasswordToken token) throws AuthenticationException;}diff --git a/core/src/main/java/io/onedev/server/security/permission/CreateProjects.java b/core/src/main/java/io/onedev/server/security/permission/CreateProjects.javaindex 5a3c891d51..5be2db7972 100644--- a/core/src/main/java/io/onedev/server/security/permission/CreateProjects.java+++ b/core/src/main/java/io/onedev/server/security/permission/CreateProjects.java@@ -6,7 +6,7 @@ public class CreateProjects implements Permission {@Overridepublic boolean implies(Permission p) {- return p instanceof CreateProjects || p instanceof PublicPermission;+ return p instanceof CreateProjects;}}diff --git a/core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java b/core/src/main/java/io/onedev/server/security/permission/ProjectPermission.javaindex 8233bd39fb..fb3673f0d7 100644--- a/core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java+++ b/core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java@@ -2,7 +2,6 @@ package io.onedev.server.security.permission;import org.apache.shiro.authz.Permission;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.util.facade.ProjectFacade;public class ProjectPermission implements Permission {@@ -30,7 +29,7 @@ public class ProjectPermission implements Permission {ProjectPermission projectPermission = (ProjectPermission) p;return project.equals(projectPermission.getProject()) && privilege.implies(projectPermission.getPrivilege());} else {- return p instanceof PublicPermission;+ return false;}}diff --git a/core/src/main/java/io/onedev/server/security/permission/ProjectPrivilege.java b/core/src/main/java/io/onedev/server/security/permission/ProjectPrivilege.javaindex 54a2c06b13..f1eba7116f 100644--- a/core/src/main/java/io/onedev/server/security/permission/ProjectPrivilege.java+++ b/core/src/main/java/io/onedev/server/security/permission/ProjectPrivilege.java@@ -1,56 +1,31 @@package io.onedev.server.security.permission;public enum ProjectPrivilege {-- ReadCode("Read code") {-- @Override- public boolean implies(ProjectPrivilege privilege) {- return privilege == ReadCode;- }-- },- WriteCode("Write code") {-- @Override- public boolean implies(ProjectPrivilege privilege) {- return privilege == WriteCode || ReadCode.implies(privilege);- }-- },- ReadIssues("Read issues") {-- @Override- public boolean implies(ProjectPrivilege privilege) {- return privilege == ReadIssues;- }-- },- CreateIssues("Create issues") {+ ISSUE_READ("Issue read") {@Overridepublic boolean implies(ProjectPrivilege privilege) {- return privilege == CreateIssues || ReadIssues.implies(privilege);+ return privilege == ISSUE_READ;}},- EditIssues("Edit issues") {+ CODE_READ("Code read") {@Overridepublic boolean implies(ProjectPrivilege privilege) {- return privilege == EditIssues || CreateIssues.implies(privilege);+ return privilege == CODE_READ || ISSUE_READ.implies(privilege);}},- DeleteIssues("Delete issues") {+ CODE_WRITE("Code write") {@Overridepublic boolean implies(ProjectPrivilege privilege) {- return privilege == DeleteIssues || EditIssues.implies(privilege);+ return privilege == CODE_WRITE || CODE_READ.implies(privilege);}},- ProjectAdministration("Project Administration") {+ PROJECT_ADMINISTRATION("Project administration") {@Overridepublic boolean implies(ProjectPrivilege privilege) {diff --git a/core/src/main/java/io/onedev/server/security/permission/PublicPermission.java b/core/src/main/java/io/onedev/server/security/permission/PublicPermission.javadeleted file mode 100644index 28d6280bf0..0000000000--- a/core/src/main/java/io/onedev/server/security/permission/PublicPermission.java+++ /dev/null@@ -1,20 +0,0 @@-package io.onedev.server.security.permission;--import org.apache.shiro.authz.Permission;--import io.onedev.server.security.ProjectPrivilege;--public class PublicPermission implements Permission {-- @Override- public boolean implies(Permission p) {- if (p instanceof ProjectPermission) {- ProjectPermission projectPermission = (ProjectPermission) p;- return projectPermission.getProject().isPublicRead()- && projectPermission.getPrivilege() == ProjectPrivilege.READ;- } else {- return p instanceof PublicPermission;- }- }--}diff --git a/core/src/main/java/io/onedev/server/security/permission/UserAdministration.java b/core/src/main/java/io/onedev/server/security/permission/UserAdministration.javaindex 9124aef117..0fdf29b9e6 100644--- a/core/src/main/java/io/onedev/server/security/permission/UserAdministration.java+++ b/core/src/main/java/io/onedev/server/security/permission/UserAdministration.java@@ -22,7 +22,7 @@ public class UserAdministration implements Permission {UserAdministration userAdmin = (UserAdministration) p;return user.equals(userAdmin.getUser());} else {- return p instanceof PublicPermission;+ return false;}}diff --git a/core/src/main/java/io/onedev/server/util/facade/GroupAuthorizationFacade.java b/core/src/main/java/io/onedev/server/util/facade/GroupAuthorizationFacade.javadeleted file mode 100644index 170cbef652..0000000000--- a/core/src/main/java/io/onedev/server/util/facade/GroupAuthorizationFacade.java+++ /dev/null@@ -1,36 +0,0 @@-package io.onedev.server.util.facade;--import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.security.ProjectPrivilege;--public class GroupAuthorizationFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final Long groupId;-- private final Long projectId;-- private final ProjectPrivilege privilege;-- public GroupAuthorizationFacade(GroupAuthorization groupAuthorization) {- super(groupAuthorization.getId());-- groupId = groupAuthorization.getGroup().getId();- projectId = groupAuthorization.getProject().getId();- privilege = groupAuthorization.getPrivilege();- }-- public Long getGroupId() {- return groupId;- }-- public Long getProjectId() {- return projectId;- }-- public ProjectPrivilege getPrivilege() {- return privilege;- }--}diff --git a/core/src/main/java/io/onedev/server/util/facade/GroupFacade.java b/core/src/main/java/io/onedev/server/util/facade/GroupFacade.javadeleted file mode 100644index aa424c92a4..0000000000--- a/core/src/main/java/io/onedev/server/util/facade/GroupFacade.java+++ /dev/null@@ -1,34 +0,0 @@-package io.onedev.server.util.facade;--import io.onedev.server.model.Group;--public class GroupFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final String name;-- private final boolean administrator;-- private final boolean canCreateProjects;-- public GroupFacade(Group group) {- super(group.getId());- name = group.getName();- administrator = group.isAdministrator();- canCreateProjects = group.isCanCreateProjects();- }-- public String getName() {- return name;- }-- public boolean isAdministrator() {- return administrator;- }-- public boolean isCanCreateProjects() {- return canCreateProjects;- }--}diff --git a/core/src/main/java/io/onedev/server/util/facade/MembershipFacade.java b/core/src/main/java/io/onedev/server/util/facade/MembershipFacade.javaindex ec3fd953f4..be256afc32 100644--- a/core/src/main/java/io/onedev/server/util/facade/MembershipFacade.java+++ b/core/src/main/java/io/onedev/server/util/facade/MembershipFacade.java@@ -6,19 +6,19 @@ public class MembershipFacade extends EntityFacade {private static final long serialVersionUID = 1L;- private final Long groupId;+ private final Long teamId;private final Long userId;public MembershipFacade(Membership membership) {super(membership.getId());- groupId = membership.getGroup().getId();+ teamId = membership.getTeam().getId();userId = membership.getUser().getId();}- public Long getGroupId() {- return groupId;+ public Long getTeamId() {+ return teamId;}public Long getUserId() {diff --git a/core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java b/core/src/main/java/io/onedev/server/util/facade/ProjectFacade.javaindex 6ad34b0cda..378b919e7b 100644--- a/core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java+++ b/core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java@@ -7,6 +7,7 @@ import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ProjectPrivilege;public class ProjectFacade extends EntityFacade {@@ -14,23 +15,23 @@ public class ProjectFacade extends EntityFacade {private final String name;+ private final ProjectPrivilege defaultPrivilege;+private final String uuid;- private final boolean publicRead;-public ProjectFacade(Project project) {super(project.getId());name = project.getName();+ defaultPrivilege = project.getDefaultPrivilege();uuid = project.getUUID();- publicRead = project.isPublicRead();}public String getName() {return name;}- public boolean isPublicRead() {- return publicRead;+ public ProjectPrivilege getDefaultPrivilege() {+ return defaultPrivilege;}public String getUUID() {diff --git a/core/src/main/java/io/onedev/server/util/facade/TeamFacade.java b/core/src/main/java/io/onedev/server/util/facade/TeamFacade.javanew file mode 100644index 0000000000..5df372d1e6--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/facade/TeamFacade.java@@ -0,0 +1,39 @@+package io.onedev.server.util.facade;++import io.onedev.server.model.Team;+import io.onedev.server.security.permission.ProjectPrivilege;++public class TeamFacade extends EntityFacade {++ private static final long serialVersionUID = 1L;++ private final Long projectId;++ private final String name;++ private ProjectPrivilege privilege;++ public TeamFacade(Team team) {+ super(team.getId());+ projectId = team.getProject().getId();+ name = team.getName();+ privilege = team.getPrivilege();+ }++ public String getName() {+ return name;+ }++ public Long getProjectId() {+ return projectId;+ }++ public ProjectPrivilege getPrivilege() {+ return privilege;+ }++ public void setPrivilege(ProjectPrivilege privilege) {+ this.privilege = privilege;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/facade/UserAuthorizationFacade.java b/core/src/main/java/io/onedev/server/util/facade/UserAuthorizationFacade.javadeleted file mode 100644index f03d6aae88..0000000000--- a/core/src/main/java/io/onedev/server/util/facade/UserAuthorizationFacade.java+++ /dev/null@@ -1,36 +0,0 @@-package io.onedev.server.util.facade;--import io.onedev.server.model.UserAuthorization;-import io.onedev.server.security.ProjectPrivilege;--public class UserAuthorizationFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final Long userId;-- private final Long projectId;-- private final ProjectPrivilege privilege;-- public UserAuthorizationFacade(UserAuthorization userAuthorization) {- super(userAuthorization.getId());-- userId = userAuthorization.getUser().getId();- projectId = userAuthorization.getProject().getId();- privilege = userAuthorization.getPrivilege();- }-- public Long getUserId() {- return userId;- }-- public Long getProjectId() {- return projectId;- }-- public ProjectPrivilege getPrivilege() {- return privilege;- }--}diff --git a/core/src/main/java/io/onedev/server/util/facade/UserFacade.java b/core/src/main/java/io/onedev/server/util/facade/UserFacade.javaindex dc134de83e..1292a4f098 100644--- a/core/src/main/java/io/onedev/server/util/facade/UserFacade.java+++ b/core/src/main/java/io/onedev/server/util/facade/UserFacade.java@@ -15,6 +15,10 @@ public class UserFacade extends EntityFacade {private final String email;+ private final boolean administrator;++ private final boolean canCreateProjects;+private final String uuid;public UserFacade(User user) {@@ -23,6 +27,8 @@ public class UserFacade extends EntityFacade {name = user.getName();fullName = user.getFullName();email = user.getEmail();+ administrator = user.isAdministrator();+ canCreateProjects = user.isCanCreateProjects();uuid = user.getUUID();}@@ -38,6 +44,14 @@ public class UserFacade extends EntityFacade {return email;}+ public boolean isAdministrator() {+ return administrator;+ }++ public boolean isCanCreateProjects() {+ return canCreateProjects;+ }+public String getUUID() {return uuid;}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex 5e0d7b035a..2bb14bba36 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -47,7 +47,7 @@ public abstract class InputSpec implements Serializable {public static final String USER = "User";- public static final String GROUP = "Group";+ public static final String TEAM = "Team";public static final String ISSUE = "Issue";diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.javadeleted file mode 100644index f3a205f7df..0000000000--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.java+++ /dev/null@@ -1,21 +0,0 @@-package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;--import java.util.ArrayList;-import java.util.List;--import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=100, name="All groups")-public class AllGroups implements ChoiceProvider {-- private static final long serialVersionUID = 1L;-- @Override- public List<GroupFacade> getChoices(boolean allPossible) {- return new ArrayList<>(OneDev.getInstance(CacheManager.class).getGroups().values());- }--}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/TeamChoiceInput.javasimilarity index 77%rename from core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.javarename to core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/TeamChoiceInput.javaindex d88a3e950d..ad60bde1b2 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/TeamChoiceInput.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.groupchoiceinput;+package io.onedev.server.util.inputspec.teamchoiceinput;import java.util.ArrayList;import java.util.List;@@ -8,22 +8,22 @@ import javax.validation.Validator;import javax.validation.constraints.NotNull;import io.onedev.server.OneDev;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.facade.TeamFacade;import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.AllGroups;-import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;+import io.onedev.server.util.inputspec.teamchoiceinput.choiceprovider.AllTeams;+import io.onedev.server.util.inputspec.teamchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.teamchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.teamchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import jersey.repackaged.com.google.common.collect.Lists;-@Editable(order=160, name=InputSpec.GROUP)-public class GroupChoiceInput extends InputSpec {+@Editable(order=160, name=InputSpec.TEAM)+public class TeamChoiceInput extends InputSpec {private static final long serialVersionUID = 1L;- private ChoiceProvider choiceProvider = new AllGroups();+ private ChoiceProvider choiceProvider = new AllTeams();private DefaultValueProvider defaultValueProvider;@@ -51,8 +51,8 @@ public class GroupChoiceInput extends InputSpec {public List<String> getPossibleValues() {List<String> possibleValues = new ArrayList<>();if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty()) {- for (GroupFacade group: getChoiceProvider().getChoices(true))- possibleValues.add(group.getName());+ for (TeamFacade team: getChoiceProvider().getChoices(true))+ possibleValues.add(team.getName());}return possibleValues;}@@ -65,7 +65,7 @@ public class GroupChoiceInput extends InputSpec {appendCommonAnnotations(buffer, index);if (!isAllowEmpty())buffer.append(" @NotEmpty\n");- appendChoiceProvider(buffer, index, "@GroupChoice");+ appendChoiceProvider(buffer, index, "@TeamChoice");appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);return buffer.toString();diff --git a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/AllTeams.java b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/AllTeams.javanew file mode 100644index 0000000000..8478a68ab2--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/AllTeams.java@@ -0,0 +1,27 @@+package io.onedev.server.util.inputspec.teamchoiceinput.choiceprovider;++import java.util.ArrayList;+import java.util.List;++import io.onedev.server.OneDev;+import io.onedev.server.manager.CacheManager;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.facade.TeamFacade;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=100, name="All teams")+public class AllTeams implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ @Override+ public List<TeamFacade> getChoices(boolean allPossible) {+ List<TeamFacade> teams = new ArrayList<>();+ for (TeamFacade team: OneDev.getInstance(CacheManager.class).getTeams().values()) {+ if (team.getProjectId().equals(OneContext.get().getProject().getId()))+ teams.add(team);+ }+ return teams;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ChoiceProvider.javasimilarity index 51%rename from core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.javarename to core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ChoiceProvider.javaindex 986c5fd739..55c065cb47 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ChoiceProvider.java@@ -1,14 +1,14 @@-package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;+package io.onedev.server.util.inputspec.teamchoiceinput.choiceprovider;import java.io.Serializable;import java.util.List;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.facade.TeamFacade;import io.onedev.server.web.editable.annotation.Editable;@Editablepublic interface ChoiceProvider extends Serializable {- List<GroupFacade> getChoices(boolean allPossible);+ List<TeamFacade> getChoices(boolean allPossible);}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ScriptingChoices.javasimilarity index 81%rename from core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.javarename to core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ScriptingChoices.javaindex 4102fada7b..c31d770667 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ScriptingChoices.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;+package io.onedev.server.util.inputspec.teamchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.HashMap;@@ -10,7 +10,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.server.util.GroovyUtils;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.facade.TeamFacade;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.OmitName;@@ -25,7 +25,7 @@ public class ScriptingChoices implements ChoiceProvider {private String script;- @Editable(description="Groovy script to be evaluated. The return value should be a list of group facade object to be used as choices. "+ @Editable(description="Groovy script to be evaluated. The return value should be a list of team facade object to be used as choices. "+ "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")@NotEmpty@Script@@ -41,11 +41,11 @@ public class ScriptingChoices implements ChoiceProvider {@SuppressWarnings("unchecked")@Override- public List<GroupFacade> getChoices(boolean allPossible) {+ public List<TeamFacade> getChoices(boolean allPossible) {Map<String, Object> variables = new HashMap<>();variables.put("allPossible", allPossible);try {- return (List<GroupFacade>) GroovyUtils.evalScript(getScript(), variables);+ return (List<TeamFacade>) GroovyUtils.evalScript(getScript(), variables);} catch (RuntimeException e) {if (allPossible) {logger.error("Error getting all possible choices", e);diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/DefaultValueProvider.javasimilarity index 71%rename from core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.javarename to core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/DefaultValueProvider.javaindex 840810ad4b..20db0290bd 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.teamchoiceinput.defaultvalueprovider;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javarename to core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 62b12fa8e4..744bdb2d53 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.teamchoiceinput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;@@ -15,7 +15,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {private String script;- @Editable(description="Groovy script to be evaluated. It should return name of a group. "+ @Editable(description="Groovy script to be evaluated. It should return name of a team. "+ "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")@NotEmpty@Scriptdiff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javasimilarity index 75%rename from core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 1d5f9d6633..3999d961f0 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.teamchoiceinput.defaultvalueprovider;import java.util.List;@@ -10,10 +10,10 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.util.OneContext;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.facade.TeamFacade;+import io.onedev.server.util.inputspec.teamchoiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.GroupChoice;+import io.onedev.server.web.editable.annotation.TeamChoice;import io.onedev.server.web.editable.annotation.OmitName;@Editable(order=100, name="Specified default value")@@ -24,7 +24,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {private String value;@Editable(name="Literal default value")- @GroupChoice("getValueChoices")+ @TeamChoice("getValueChoices")@NotEmpty@OmitNamepublic String getValue() {@@ -41,7 +41,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {}@SuppressWarnings("unused")- private static List<GroupFacade> getValueChoices() {+ private static List<TeamFacade> getValueChoices() {ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return choiceProvider.getChoices(true);diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.javaindex be2fd273dd..db42d1841a 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java@@ -11,8 +11,8 @@ import io.onedev.server.OneDev;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.GroupUsers;-import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ProjectReaders;+import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.IssueReaders;+import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.TeamUsers;import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.web.editable.annotation.Editable;@@ -24,7 +24,7 @@ public class UserChoiceInput extends InputSpec {private static final long serialVersionUID = 1L;- private ChoiceProvider choiceProvider = new ProjectReaders();+ private ChoiceProvider choiceProvider = new IssueReaders();private DefaultValueProvider defaultValueProvider;@@ -101,10 +101,10 @@ public class UserChoiceInput extends InputSpec {@Overridepublic void onRenameGroup(String oldName, String newName) {- if (choiceProvider instanceof GroupUsers) {- GroupUsers groupUsers = (GroupUsers) choiceProvider;- if (groupUsers.getGroupName().equals(oldName))- groupUsers.setGroupName(newName);+ if (choiceProvider instanceof TeamUsers) {+ TeamUsers groupUsers = (TeamUsers) choiceProvider;+ if (groupUsers.getTeamName().equals(oldName))+ groupUsers.setTeamName(newName);}}@@ -112,9 +112,9 @@ public class UserChoiceInput extends InputSpec {public boolean onDeleteGroup(String groupName) {if (super.onDeleteGroup(groupName))return true;- if (choiceProvider instanceof GroupUsers) {- GroupUsers groupUsers = (GroupUsers) choiceProvider;- if (groupUsers.getGroupName().equals(groupName))+ if (choiceProvider instanceof TeamUsers) {+ TeamUsers groupUsers = (TeamUsers) choiceProvider;+ if (groupUsers.getTeamName().equals(groupName))return true;}return false;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectReaders.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.javasimilarity index 73%rename from core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectReaders.javarename to core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.javaindex 58130ac5d6..e8bf5458be 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectReaders.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java@@ -4,21 +4,21 @@ import java.util.ArrayList;import java.util.List;import io.onedev.server.model.Project;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.OneContext;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=120, name="Users able to access the project")-public class ProjectReaders implements ChoiceProvider {+@Editable(order=130, name="Users with code read privilege")+public class CodeReaders implements ChoiceProvider {private static final long serialVersionUID = 1L;@Overridepublic List<UserFacade> getChoices(boolean allPossible) {Project project = OneContext.get().getProject();- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.READ));+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.CODE_READ));}}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectWriters.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.javasimilarity index 73%rename from core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectWriters.javarename to core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.javaindex 32ab2862c7..c662805103 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectWriters.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java@@ -4,21 +4,21 @@ import java.util.ArrayList;import java.util.List;import io.onedev.server.model.Project;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.OneContext;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=130, name="Users able to write the project")-public class ProjectWriters implements ChoiceProvider {+@Editable(order=130, name="Users allowed to write code")+public class CodeWriters implements ChoiceProvider {private static final long serialVersionUID = 1L;@Overridepublic List<UserFacade> getChoices(boolean allPossible) {Project project = OneContext.get().getProject();- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.WRITE));+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.CODE_WRITE));}}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.javanew file mode 100644index 0000000000..b12cfb88dd--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java@@ -0,0 +1,24 @@+package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;++import java.util.ArrayList;+import java.util.List;++import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=130, name="Users allowed to read issues")+public class IssueReaders implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ @Override+ public List<UserFacade> getChoices(boolean allPossible) {+ Project project = OneContext.get().getProject();+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ISSUE_READ));+ }++}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.javaindex afb0f0adb5..f4143b0efc 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java@@ -4,13 +4,13 @@ import java.util.ArrayList;import java.util.List;import io.onedev.server.model.Project;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.OneContext;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=140, name="Users able to administrate the project")+@Editable(order=130, name="Project administrators")public class ProjectAdministrators implements ChoiceProvider {private static final long serialVersionUID = 1L;@@ -18,7 +18,7 @@ public class ProjectAdministrators implements ChoiceProvider {@Overridepublic List<UserFacade> getChoices(boolean allPossible) {Project project = OneContext.get().getProject();- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ADMIN));+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.PROJECT_ADMINISTRATION));}}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/TeamUsers.javasimilarity index 51%rename from core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.javarename to core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/TeamUsers.javaindex 3d0e9bd17c..68ce9b5ac6 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/TeamUsers.java@@ -6,39 +6,40 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.model.Group;+import io.onedev.server.manager.TeamManager;+import io.onedev.server.model.Team;import io.onedev.server.model.User;+import io.onedev.server.util.OneContext;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.GroupChoice;+import io.onedev.server.web.editable.annotation.TeamChoice;import io.onedev.server.web.editable.annotation.OmitName;-@Editable(order=150, name="Users belonging to group")-public class GroupUsers implements ChoiceProvider {+@Editable(order=150, name="Users belonging to team")+public class TeamUsers implements ChoiceProvider {private static final long serialVersionUID = 1L;- private String groupName;+ private String teamName;- @Editable(name="Group")- @GroupChoice+ @Editable(name="Team")+ @TeamChoice@OmitName@NotEmpty- public String getGroupName() {- return groupName;+ public String getTeamName() {+ return teamName;}- public void setGroupName(String groupName) {- this.groupName = groupName;+ public void setTeamName(String teamName) {+ this.teamName = teamName;}@Overridepublic List<UserFacade> getChoices(boolean allPossible) {List<UserFacade> choices = new ArrayList<>();- Group group = OneDev.getInstance(GroupManager.class).find(groupName);- if (group != null) {- for (User user: group.getMembers())+ Team team = OneDev.getInstance(TeamManager.class).find(OneContext.get().getProject(), teamName);+ if (team != null) {+ for (User user: team.getMembers())choices.add(user.getFacade());}return choices;diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/InvalidReviewRuleException.java b/core/src/main/java/io/onedev/server/util/reviewrequirement/InvalidReviewRuleException.javadeleted file mode 100644index 40d13ecef6..0000000000--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/InvalidReviewRuleException.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.util.reviewrequirement;--import io.onedev.server.exception.OneException;--public class InvalidReviewRuleException extends OneException {-- private static final long serialVersionUID = 1L;-- public InvalidReviewRuleException(String errorMessage) {- super(errorMessage);- }--}diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4 b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4new file mode 100644index 0000000000..486b046182--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4@@ -0,0 +1,20 @@+grammar ReviewRequirement;++requirement: ' '* criteria (' '+ criteria)* ' '* EOF;++criteria: userCriteria | teamCriteria;++userCriteria: USER Value;+teamCriteria: TEAM Value (':' count)?;++count: 'all' | DIGIT;++DIGIT: [1-9][0-9]*;++USER: 'user';+TEAM: 'team';++Value: '(' (ESCAPE|~[()\\])+? ')';++fragment+ESCAPE: '\\'[()\\];diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.javaindex bf14b271e7..bd87c31a42 100644--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java+++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java@@ -12,76 +12,88 @@ import org.antlr.v4.runtime.BailErrorStrategy;import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.tree.TerminalNode;-import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecLexer;-import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser;-import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser.CountContext;-import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser.CriteriaContext;-import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser.SpecContext;+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CountContext;+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CriteriaContext;+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.RequirementContext;import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.exception.OneException;+import io.onedev.server.manager.TeamManager;import io.onedev.server.manager.UserManager;-import io.onedev.server.model.Group;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;import io.onedev.server.model.User;public class ReviewRequirement {- private final List<User> users = new ArrayList<>();+ private final List<User> users;- private final Map<Group, Integer> groups = new LinkedHashMap<>();+ private final Map<Team, Integer> teams;- public ReviewRequirement(String spec) {- SpecContext specContext = parse(spec);+ public ReviewRequirement(List<User> users, Map<Team, Integer> teams) {+ this.users = users;+ this.teams = teams;+ }++ public static ReviewRequirement parse(Project project, String requirementString) {+ List<User> users = new ArrayList<>();+ Map<Team, Integer> teams = new LinkedHashMap<>();- for (CriteriaContext criteriaContext: specContext.criteria()) {- if (criteriaContext.userCriteria() != null) {- String userName = getBracedValue(criteriaContext.userCriteria().Value());- User user = OneDev.getInstance(UserManager.class).findByName(userName);- if (user != null) {- if (!users.contains(user)) {- users.add(user);+ if (requirementString != null) {+ RequirementContext requirement = parse(requirementString);++ for (CriteriaContext criteria: requirement.criteria()) {+ if (criteria.userCriteria() != null) {+ String userName = getBracedValue(criteria.userCriteria().Value());+ User user = OneDev.getInstance(UserManager.class).findByName(userName);+ if (user != null) {+ if (!users.contains(user)) {+ users.add(user);+ } else {+ throw new OneException("User '" + userName + "' is included multiple times");+ }} else {- throw new InvalidReviewRuleException("User '" + userName + "' is included multiple times");+ throw new OneException("Unable to find user '" + userName + "'");}- } else {- throw new InvalidReviewRuleException("Unable to find user '" + userName + "'");- }- } else if (criteriaContext.groupCriteria() != null) {- String groupName = getBracedValue(criteriaContext.groupCriteria().Value());- Group group = OneDev.getInstance(GroupManager.class).find(groupName);- if (group != null) {- if (!groups.containsKey(group)) {- CountContext countContext = criteriaContext.groupCriteria().count();- if (countContext != null) {- if (countContext.DIGIT() != null)- groups.put(group, Integer.parseInt(countContext.DIGIT().getText()));- else- groups.put(group, 0);+ } else if (criteria.teamCriteria() != null) {+ String teamName = getBracedValue(criteria.teamCriteria().Value());+ Team team = OneDev.getInstance(TeamManager.class).find(project, teamName);+ if (team!= null) {+ if (!teams.containsKey(team)) {+ CountContext count = criteria.teamCriteria().count();+ if (count != null) {+ if (count.DIGIT() != null)+ teams.put(team, Integer.parseInt(count.DIGIT().getText()));+ else+ teams.put(team, 0);+ } else {+ teams.put(team, 1);+ }} else {- groups.put(group, 1);+ throw new OneException("Team '" + teamName + "' is included multiple times");}} else {- throw new InvalidReviewRuleException("Group '" + groupName + "' is included multiple times");+ throw new OneException("Unable to find team '" + teamName + "'");}- } else {- throw new InvalidReviewRuleException("Unable to find group '" + groupName + "'");}- }+ }}++ return new ReviewRequirement(users, teams);}- public static SpecContext parse(String spec) {- ANTLRInputStream is = new ANTLRInputStream(spec);- ReviewRequirementSpecLexer lexer = new ReviewRequirementSpecLexer(is);+ public static RequirementContext parse(String requirementString) {+ ANTLRInputStream is = new ANTLRInputStream(requirementString);+ ReviewRequirementLexer lexer = new ReviewRequirementLexer(is);lexer.removeErrorListeners();CommonTokenStream tokens = new CommonTokenStream(lexer);- ReviewRequirementSpecParser parser = new ReviewRequirementSpecParser(tokens);+ ReviewRequirementParser parser = new ReviewRequirementParser(tokens);parser.removeErrorListeners();parser.setErrorHandler(new BailErrorStrategy());- return parser.spec();+ return parser.requirement();}- private String getBracedValue(TerminalNode terminal) {+ private static String getBracedValue(TerminalNode terminal) {String value = terminal.getText().substring(1);return value.substring(0, value.length()-1).trim();}@@ -90,8 +102,8 @@ public class ReviewRequirement {return users;}- public Map<Group, Integer> getGroups() {- return groups;+ public Map<Team, Integer> getTeams() {+ return teams;}public boolean matches(User user) {@@ -99,25 +111,26 @@ public class ReviewRequirement {if (!eachUser.equals(user))return false;}- for (Map.Entry<Group, Integer> entry: groups.entrySet()) {- Group group = entry.getKey();+ for (Map.Entry<Team, Integer> entry: teams.entrySet()) {+ Team team = entry.getKey();int requiredCount = entry.getValue();- if (requiredCount == 0 || requiredCount > group.getMembers().size())- requiredCount = group.getMembers().size();+ if (requiredCount == 0 || requiredCount > team.getMembers().size())+ requiredCount = team.getMembers().size();- if (requiredCount > 1 || requiredCount == 1 && !group.getMembers().contains(user))+ if (requiredCount > 1 || requiredCount == 1 && !team.getMembers().contains(user))return false;}return true;}@Nullable- public String toSpec() {+ @Override+ public String toString() {StringBuilder builder = new StringBuilder();for (User user: users)builder.append("user(").append(user.getName()).append(") ");- for (Map.Entry<Group, Integer> entry: groups.entrySet()) {- builder.append("group(").append(entry.getKey().getName()).append(")");+ for (Map.Entry<Team, Integer> entry: teams.entrySet()) {+ builder.append("team(").append(entry.getKey().getName()).append(")");if (entry.getValue() == 0)builder.append(":all");else if (entry.getValue() != 1)diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirementSpec.g4 b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirementSpec.g4deleted file mode 100644index b0d39ed5c9..0000000000--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirementSpec.g4+++ /dev/null@@ -1,20 +0,0 @@-grammar ReviewRequirementSpec;--spec: ' '* criteria (' '+ criteria)* ' '* EOF;--criteria: userCriteria | groupCriteria;--userCriteria: USER Value;-groupCriteria: GROUP Value (':' count)?;--count: 'all' | DIGIT;--DIGIT: [1-9][0-9]*;--USER: 'user';-GROUP: 'group';--Value: '(' (ESCAPE|~[()\\])+? ')';--fragment-ESCAPE: '\\'[()\\];diff --git a/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementSpecValidator.java b/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.javasimilarity index 55%rename from core/src/main/java/io/onedev/server/util/validation/ReviewRequirementSpecValidator.javarename to core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.javaindex 859c0f51f9..181e946005 100644--- a/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementSpecValidator.java+++ b/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java@@ -3,14 +3,15 @@ package io.onedev.server.util.validation;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import io.onedev.server.util.reviewrequirement.InvalidReviewRuleException;-import io.onedev.server.util.reviewrequirement.ReviewRequirement;-import io.onedev.server.web.editable.annotation.ReviewRequirementSpec;+import io.onedev.server.exception.OneException;+import io.onedev.server.model.Project;+import io.onedev.server.util.OneContext;+import io.onedev.server.web.editable.annotation.ReviewRequirement;-public class ReviewRequirementSpecValidator implements ConstraintValidator<ReviewRequirementSpec, String> {+public class ReviewRequirementValidator implements ConstraintValidator<ReviewRequirement, String> {@Override- public void initialize(ReviewRequirementSpec constaintAnnotation) {+ public void initialize(ReviewRequirement constaintAnnotation) {}@Override@@ -18,10 +19,11 @@ public class ReviewRequirementSpecValidator implements ConstraintValidator<Revieif (value == null) {return true;} else {+ Project project = OneContext.get().getProject();try {- new ReviewRequirement(value);+ io.onedev.server.util.reviewrequirement.ReviewRequirement.parse(project, value);return true;- } catch (InvalidReviewRuleException e) {+ } catch (OneException e) {constraintContext.disableDefaultConstraintViolation();constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();return false;diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex d6cb01d5f8..18ad2ca3c9 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -17,11 +17,6 @@ import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;import io.onedev.server.web.page.admin.serverlog.ServerLogPage;import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;-import io.onedev.server.web.page.group.GroupAuthorizationsPage;-import io.onedev.server.web.page.group.GroupListPage;-import io.onedev.server.web.page.group.GroupMembershipsPage;-import io.onedev.server.web.page.group.GroupProfilePage;-import io.onedev.server.web.page.group.NewGroupPage;import io.onedev.server.web.page.init.ServerInitPage;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.NoCommitsPage;@@ -49,7 +44,6 @@ import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.Requimport io.onedev.server.web.page.project.pullrequests.requestdetail.codecomments.RequestCodeCommentsPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.mergepreview.MergePreviewPage;import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;-import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;import io.onedev.server.web.page.project.setting.configuration.ConfigurationEditPage;@@ -60,6 +54,9 @@ import io.onedev.server.web.page.project.setting.issueworkflow.fields.IssueFieldimport io.onedev.server.web.page.project.setting.issueworkflow.states.IssueStatesPage;import io.onedev.server.web.page.project.setting.issueworkflow.statetransitions.StateTransitionsPage;import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;+import io.onedev.server.web.page.project.setting.team.NewTeamPage;+import io.onedev.server.web.page.project.setting.team.TeamEditPage;+import io.onedev.server.web.page.project.setting.team.TeamListPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;import io.onedev.server.web.page.project.stats.SourceLinesPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;@@ -70,11 +67,10 @@ import io.onedev.server.web.page.security.RegisterPage;import io.onedev.server.web.page.test.TestPage;import io.onedev.server.web.page.user.AvatarEditPage;import io.onedev.server.web.page.user.NewUserPage;+import io.onedev.server.web.page.user.ParticipatedProjectsPage;import io.onedev.server.web.page.user.PasswordEditPage;import io.onedev.server.web.page.user.TokenGeneratePage;-import io.onedev.server.web.page.user.UserAuthorizationsPage;import io.onedev.server.web.page.user.UserListPage;-import io.onedev.server.web.page.user.UserMembershipsPage;import io.onedev.server.web.page.user.UserProfilePage;import io.onedev.server.web.util.mapper.OnePageMapper;import io.onedev.server.web.util.mapper.OneResourceMapper;@@ -89,7 +85,6 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("init", ServerInitPage.class));addAdministrationPages();addUserPages();- addGroupPages();addProjectPages();addSecurityPages();@@ -128,21 +123,12 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("users", UserListPage.class));add(new OnePageMapper("users/new", NewUserPage.class));add(new OnePageMapper("users/${user}/profile", UserProfilePage.class));- add(new OnePageMapper("users/${user}/groups", UserMembershipsPage.class));- add(new OnePageMapper("users/${user}/authorizations", UserAuthorizationsPage.class));add(new OnePageMapper("users/${user}/avatar", AvatarEditPage.class));add(new OnePageMapper("users/${user}/password", PasswordEditPage.class));add(new OnePageMapper("users/${user}/token", TokenGeneratePage.class));+ add(new OnePageMapper("users/${user}/participated-projects", ParticipatedProjectsPage.class));}- private void addGroupPages() {- add(new OnePageMapper("groups", GroupListPage.class));- add(new OnePageMapper("groups/new", NewGroupPage.class));- add(new OnePageMapper("groups/${group}/profile", GroupProfilePage.class));- add(new OnePageMapper("groups/${group}/members", GroupMembershipsPage.class));- add(new OnePageMapper("groups/${group}/authorizations", GroupAuthorizationsPage.class));- }-private void addProjectPages() {add(new OnePageMapper("projects", ProjectListPage.class) {@@ -217,7 +203,9 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/milestones/new", NewMilestonePage.class));add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));- add(new OnePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));+ add(new OnePageMapper("projects/${project}/settings/teams", TeamListPage.class));+ add(new OnePageMapper("projects/${project}/settings/teams/new", NewTeamPage.class));+ add(new OnePageMapper("projects/${project}/settings/teams/${team}", TeamEditPage.class));add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class));add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class));add(new OnePageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class));diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 48d11e3857..8f01d89bbb 100644--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -33,7 +33,7 @@ import io.onedev.codeassist.parser.TerminalExpect;import io.onedev.server.OneDev;import io.onedev.server.exception.OneException;import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.manager.TeamManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.PullRequestManager;import io.onedev.server.manager.UserManager;@@ -57,8 +57,8 @@ import io.onedev.server.util.inputspec.PullRequestChoiceInput;import io.onedev.server.util.inputspec.booleaninput.BooleanInput;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.dateinput.DateInput;-import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;import io.onedev.server.util.inputspec.numberinput.NumberInput;+import io.onedev.server.util.inputspec.teamchoiceinput.TeamChoiceInput;import io.onedev.server.util.inputspec.textinput.TextInput;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;@@ -173,8 +173,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {}} else if (fieldSpec instanceof BooleanInput) {suggestions.addAll(getSuggestions(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith, null));- } else if (fieldSpec instanceof GroupChoiceInput) {- List<String> candidates = OneDev.getInstance(GroupManager.class).findAll().stream().map(it->it.getName()).collect(Collectors.toList());+ } else if (fieldSpec instanceof TeamChoiceInput) {+ List<String> candidates = OneDev.getInstance(TeamManager.class).findAll().stream().map(it->it.getName()).collect(Collectors.toList());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));} else if (fieldName.equals(FIELD_STATE)) {List<String> candidates = project.getIssueWorkflow().getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex 1302000fad..1b78b61fca 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -129,7 +129,7 @@ public abstract class CodeCommentPanel extends Panel {}, null));WebMarkupContainer foot = new WebMarkupContainer("foot");- foot.setVisible(SecurityUtils.canModify(getComment()));+ foot.setVisible(SecurityUtils.canModifyOrDelete(getComment()));foot.add(new AjaxLink<Void>("edit") {@Override@@ -273,7 +273,7 @@ public abstract class CodeCommentPanel extends Panel {}, null));WebMarkupContainer foot = new WebMarkupContainer("foot");- foot.setVisible(SecurityUtils.canModify(reply));+ foot.setVisible(SecurityUtils.canModifyOrDelete(reply));foot.add(new AjaxLink<Void>("edit") {diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.javaindex ebe7ef7d9a..1d57de5de9 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java@@ -42,7 +42,7 @@ public class InvalidCodeCommentPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canModify(getCodeComment()));+ setVisible(SecurityUtils.canAdministrate(getCodeComment().getProject().getFacade()));}}.add(new ConfirmOnClick("Really want to delete this code comment?")));diff --git a/core/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java b/core/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.javaindex e5b260ed56..996ab36668 100644--- a/core/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java@@ -212,7 +212,7 @@ public class CommitListPanel extends Panel {response.render(CssHeaderItem.forReference(new CommitListResourceReference()));String jsonOfCommits = CommitGraphUtils.asJSON(commitsModel.getObject());- String script = String.format("onedev.server.commitgraph.render('%s', %s);", container.getMarkupId(), jsonOfCommits);+ String script = String.format("onedev.server.commitGraph.render('%s', %s);", container.getMarkupId(), jsonOfCommits);response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.javadeleted file mode 100644index 74ee5beda6..0000000000--- a/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java+++ /dev/null@@ -1,39 +0,0 @@-package io.onedev.server.web.component.groupchoice;--import java.util.ArrayList;-import java.util.Comparator;-import java.util.List;--import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.component.select2.Response;-import io.onedev.server.web.component.select2.ResponseFiller;-import io.onedev.utils.matchscore.MatchScoreProvider;-import io.onedev.utils.matchscore.MatchScoreUtils;--public class GroupChoiceProvider extends AbstractGroupChoiceProvider {-- private static final long serialVersionUID = 1L;-- private final List<GroupFacade> choices;-- public GroupChoiceProvider(List<GroupFacade> choices) {- this.choices = new ArrayList<>(choices);- this.choices.sort(Comparator.comparing(GroupFacade::getName));- }-- @Override- public void query(String term, int page, Response<GroupFacade> response) {- List<GroupFacade> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<GroupFacade>() {-- @Override- public double getMatchScore(GroupFacade object) {- return MatchScoreUtils.getMatchScore(object.getName(), term);- }-- });-- new ResponseFiller<GroupFacade>(response).fill(matched, page, WebConstants.PAGE_SIZE);- }--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceResourceReference.java b/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceResourceReference.javadeleted file mode 100644index 62b54bbb4c..0000000000--- a/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.groupchoice;--import io.onedev.server.web.page.base.BaseDependentResourceReference;--public class GroupChoiceResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public GroupChoiceResourceReference() {- super(GroupChoiceResourceReference.class, "group-choice.js");- }--}diff --git a/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java b/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.javadeleted file mode 100644index 903039de89..0000000000--- a/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java+++ /dev/null@@ -1,37 +0,0 @@-package io.onedev.server.web.component.groupchoice;--import java.util.Collection;--import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.model.IModel;--import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.web.component.select2.Select2MultiChoice;--@SuppressWarnings("serial")-public class GroupMultiChoice extends Select2MultiChoice<GroupFacade> {-- public GroupMultiChoice(String id, IModel<Collection<GroupFacade>> groupsModel,- AbstractGroupChoiceProvider choiceProvider) {- super(id, groupsModel, choiceProvider);- }-- @Override- protected void onInitialize() {- super.onInitialize();- if (isRequired())- getSettings().setPlaceholder("Choose groups ...");- getSettings().setFormatResult("onedev.server.groupChoiceFormatter.formatResult");- getSettings().setFormatSelection("onedev.server.groupChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("onedev.server.groupChoiceFormatter.escapeMarkup");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new GroupChoiceResourceReference()));- }--}diff --git a/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java b/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.javadeleted file mode 100644index c5cd875ee2..0000000000--- a/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java+++ /dev/null@@ -1,41 +0,0 @@-package io.onedev.server.web.component.groupchoice;--import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.model.IModel;--import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.web.component.select2.Select2Choice;--@SuppressWarnings("serial")-public class GroupSingleChoice extends Select2Choice<GroupFacade> {-- public GroupSingleChoice(String id, IModel<GroupFacade> groupModel,- AbstractGroupChoiceProvider choiceProvider) {- super(id, groupModel, choiceProvider);- }-- @Override- protected void onInitialize() {- super.onInitialize();- if (isRequired())- getSettings().setPlaceholder("Choose a group ...");- getSettings().setFormatResult("onedev.server.groupChoiceFormatter.formatResult");- getSettings().setFormatSelection("onedev.server.groupChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("onedev.server.groupChoiceFormatter.escapeMarkup");- }-- @Override- protected void onBeforeRender() {- getSettings().setAllowClear(!isRequired());- super.onBeforeRender();- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new GroupChoiceResourceReference()));- }--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex 1239824908..4e32aca975 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -270,7 +270,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));}});@@ -280,15 +280,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {query = parsedQueryModel.getObject().toString();elsequery = null;- add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject(), query)) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canRead(getProject()));- }-- });+ add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject(), query)));others.add(batchEditSelected = new ModalLink("batchEditSelected") {@@ -386,7 +378,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()) && issuesTable.getItemCount() != 0);+ setVisible(SecurityUtils.canWriteCode(getProject().getFacade()) && issuesTable.getItemCount() != 0);}});@@ -443,7 +435,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});- if (SecurityUtils.canManage(getProject())) {+ if (SecurityUtils.canWriteCode(getProject().getFacade())) {columns.add(selectionColumn = new SelectionColumn<Issue, Void>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/link/ProjectLink.java b/core/src/main/java/io/onedev/server/web/component/link/ProjectLink.javanew file mode 100644index 0000000000..9649ac567c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/link/ProjectLink.java@@ -0,0 +1,25 @@+package io.onedev.server.web.component.link;++import org.apache.wicket.Page;++import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;++public class ProjectLink extends ViewStateAwarePageLink<Void> {++ private static final long serialVersionUID = 1L;++ public ProjectLink(String id, Project project) {+ super(id, getPageClass(project), ProjectPage.paramsOf(project));+ }++ private static Class<? extends Page> getPageClass(Project project) {+ if (SecurityUtils.canReadCode(project.getFacade()))+ return ProjectBlobPage.class;+ else+ return IssueListPage.class;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/component/projectcomment/CommentInput.java b/core/src/main/java/io/onedev/server/web/component/projectcomment/CommentInput.javaindex 58dac5cdde..114194330e 100644--- a/core/src/main/java/io/onedev/server/web/component/projectcomment/CommentInput.java+++ b/core/src/main/java/io/onedev/server/web/component/projectcomment/CommentInput.java@@ -15,8 +15,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.markdown.MarkdownEditor;import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;@@ -39,7 +39,7 @@ public abstract class CommentInput extends MarkdownEditor {@Overridepublic List<UserFacade> findUsers(String query, int count) {List<UserFacade> users = new ArrayList<>(- SecurityUtils.getAuthorizedUsers(getProject().getFacade(), ProjectPrivilege.READ));+ SecurityUtils.getAuthorizedUsers(getProject().getFacade(), ProjectPrivilege.ISSUE_READ));users.sort(Comparator.comparing(UserFacade::getDisplayName));users = MatchScoreUtils.filterAndSort(users, new MatchScoreProvider<UserFacade>() {diff --git a/core/src/main/java/io/onedev/server/web/component/projectcomment/ProjectCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/projectcomment/ProjectCommentPanel.javaindex 47e117980c..c8bb36b321 100644--- a/core/src/main/java/io/onedev/server/web/component/projectcomment/ProjectCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/projectcomment/ProjectCommentPanel.java@@ -71,7 +71,7 @@ public abstract class ProjectCommentPanel extends Panel {}WebMarkupContainer actions = new WebMarkupContainer("actions");- actions.setVisible(canManageComment());+ actions.setVisible(canModifyOrDeleteComment());actions.add(new AjaxLink<Void>("edit") {@Override@@ -201,7 +201,7 @@ public abstract class ProjectCommentPanel extends Panel {protected abstract AttachmentSupport getAttachmentSupport();- protected abstract boolean canManageComment();+ protected abstract boolean canModifyOrDeleteComment();@Nullableprotected abstract String getRequiredLabel();diff --git a/core/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.java b/core/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.javaindex a4651d038b..24a9b01755 100644--- a/core/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.java@@ -36,8 +36,8 @@ import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;+import io.onedev.server.web.component.link.ProjectLink;import io.onedev.server.web.component.link.UserLink;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.PagingHistorySupport;@@ -68,8 +68,7 @@ public class ProjectListPanel extends Panel {IModel<ProjectFacade> rowModel) {Fragment fragment = new Fragment(componentId, "projectFrag", ProjectListPanel.this);Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId());- Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectBlobPage.class,- ProjectBlobPage.paramsOf(project));+ Link<Void> link = new ProjectLink("link", project);link.add(new Label("name", project.getName()));fragment.add(link);cellItem.add(fragment);diff --git a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.html b/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.htmldeleted file mode 100644index 6ae4182042..0000000000--- a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.html+++ /dev/null@@ -1,18 +0,0 @@-<wicket:panel>- <div class="privilege selection">- <a wicket:id="read">- <div class="title">Read</div>- <div class="description">Able to pull and browse code of the project</div>- </a>- <a wicket:id="write">- <div class="title">Write</div>- <div class="description">Has full read privilege, and can also push to- code of the project</div>- </a>- <a wicket:id="admin">- <div class="title">Admin</div>- <div class="description">Has full write privilege, and can also manage- settings of the project</div>- </a>- </div>-</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.java b/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.javadeleted file mode 100644index 6e857dc023..0000000000--- a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.java+++ /dev/null@@ -1,74 +0,0 @@-package io.onedev.server.web.component.projectprivilege.privilegeselection;--import javax.annotation.Nullable;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.panel.Panel;--import io.onedev.server.security.ProjectPrivilege;--@SuppressWarnings("serial")-public abstract class PrivilegeSelectionPanel extends Panel {-- private final ProjectPrivilege currentPrivilege;-- public PrivilegeSelectionPanel(String id, @Nullable ProjectPrivilege currentPrivilege) {- super(id);- this.currentPrivilege = currentPrivilege;- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new AjaxLink<Void>("read") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (currentPrivilege == ProjectPrivilege.READ)- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelect(target, ProjectPrivilege.READ);- }-- });- add(new AjaxLink<Void>("write") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (currentPrivilege == ProjectPrivilege.WRITE)- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelect(target, ProjectPrivilege.WRITE);- }-- });- add(new AjaxLink<Void>("admin") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (currentPrivilege == ProjectPrivilege.ADMIN)- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelect(target, ProjectPrivilege.ADMIN);- }-- });- }-- protected abstract void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege);--}diff --git a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.javadeleted file mode 100644index ee729f3a45..0000000000--- a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.web.component.projectprivilege.privilegesource;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--@SuppressWarnings("serial")-public class PrivilegeSourceCssResourceReference extends BaseDependentCssResourceReference {-- public PrivilegeSourceCssResourceReference() {- super(PrivilegeSourceCssResourceReference.class, "privilege-source.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.html b/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.htmldeleted file mode 100644index 4aa51a4f2a..0000000000--- a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:panel>- <div class="privilege-source">- <b wicket:id="user"></b> can <b wicket:id="privilege"></b> project <b wicket:id="project"></b> as:- <ul>- <li wicket:id="userIsRoot" class="user-is-root">The user is administrator</li>- <li wicket:id="projectIsPublic" class="project-is-public">The project is public</li>- <wicket:container wicket:id="groups">- <li class="user-is-member-of-group">The user is member of group <a wicket:id="group"></a></li>- </wicket:container>- </ul>- </div>-</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java b/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.javadeleted file mode 100644index 6e4f4d5680..0000000000--- a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java+++ /dev/null@@ -1,145 +0,0 @@-package io.onedev.server.web.component.projectprivilege.privilegesource;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-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.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;--import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserManager;-import io.onedev.server.model.Group;-import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.model.Membership;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.security.ProjectPrivilege;-import io.onedev.server.web.page.group.GroupAuthorizationsPage;-import io.onedev.server.web.page.group.GroupProfilePage;--@SuppressWarnings("serial")-public class PrivilegeSourcePanel extends Panel {-- private final IModel<User> userModel;-- private final IModel<Project> projectModel;-- private final ProjectPrivilege privilege;-- public PrivilegeSourcePanel(String id, User user, Project project, ProjectPrivilege privilege) {- super(id);-- Long userId = user.getId();- userModel = new LoadableDetachableModel<User>() {-- @Override- protected User load() {- return OneDev.getInstance(UserManager.class).load(userId);- }-- };-- Long projectId = project.getId();- projectModel = new LoadableDetachableModel<Project>() {-- @Override- protected Project load() {- return OneDev.getInstance(ProjectManager.class).load(projectId);- }-- };-- this.privilege = privilege;- }-- @Override- public void onInitialize() {- super.onInitialize();-- User user = userModel.getObject();- Project project = projectModel.getObject();- add(new Label("user", user.getDisplayName()));- add(new Label("project", project.getName()));- add(new Label("privilege", privilege.name()));-- add(new WebMarkupContainer("userIsRoot").setVisible(user.isRoot()));- add(new WebMarkupContainer("projectIsPublic")- .setVisible(privilege == ProjectPrivilege.READ && project.isPublicRead()));- add(new ListView<Group>("groups", new LoadableDetachableModel<List<Group>>() {-- @Override- protected List<Group> load() {- List<Group> groups = new ArrayList<>();- for (Membership membership: user.getMemberships()) {- if (membership.getGroup().isAdministrator()) {- groups.add(membership.getGroup());- } else {- for (GroupAuthorization authorization: membership.getGroup().getAuthorizations()) {- if (authorization.getProject().equals(project)- && authorization.getPrivilege() == privilege) {- groups.add(membership.getGroup());- break;- }- }- }- }- return groups;- }-- }) {-- @Override- protected void populateItem(ListItem<Group> item) {- Group group = item.getModelObject();- if (group.isAdministrator()) {- item.add(new BookmarkablePageLink<Void>("group", GroupProfilePage.class,- GroupAuthorizationsPage.paramsOf(group)) {-- @Override- public IModel<?> getBody() {- return Model.of(item.getModelObject().getName());- }-- });- } else {- item.add(new BookmarkablePageLink<Void>("group", GroupAuthorizationsPage.class,- GroupAuthorizationsPage.paramsOf(group)) {-- @Override- public IModel<?> getBody() {- return Model.of(item.getModelObject().getName());- }-- });- }- }-- });- }-- @Override- protected void onDetach() {- userModel.detach();- projectModel.detach();-- super.onDetach();- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(CssHeaderItem.forReference(new PrivilegeSourceCssResourceReference()));- }--}diff --git a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/privilege-source.css b/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/privilege-source.cssdeleted file mode 100644index 4ad64569e0..0000000000--- a/core/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/privilege-source.css+++ /dev/null@@ -1,12 +0,0 @@-.privilege-source {- padding: 8px;-}-.privilege-source b {- color: #444;-}-.privilege-source a {- font-weight: bold;-}-.privilege-source ul {- margin-bottom: 0;-}diff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.javaindex 8caa865831..e294a14cec 100644--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java@@ -29,7 +29,6 @@ import io.onedev.server.manager.PullRequestManager;import io.onedev.server.manager.PullRequestReviewManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.JsoupUtils;@@ -198,10 +197,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {protected void onConfigure() {super.onConfigure();- PullRequest request = getPullRequest();- User currentUser = SecurityUtils.getUser();- setVisible(currentUser != null && currentUser.equals(request.getSubmitter())- || SecurityUtils.canManage(request.getTargetProject()));+ setVisible(SecurityUtils.canModify(getPullRequest()) && !request.isMerged());}});@@ -215,8 +211,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {protected void onConfigure() {super.onConfigure();- PullRequest request = getPullRequest();- setVisible(SecurityUtils.canModify(request) && !request.isMerged());+ setVisible(!getPullRequest().isMerged() && SecurityUtils.canModify(getPullRequest()));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.javaindex 47d91e4f17..4777d281bb 100644--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java@@ -9,8 +9,8 @@ import org.apache.wicket.model.IModel;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.select2.Response;@@ -32,7 +32,7 @@ public class ReviewerProvider extends AbstractUserChoiceProvider {public void query(String term, int page, Response<UserFacade> response) {PullRequest request = requestModel.getObject();Collection<UserFacade> users = SecurityUtils.getAuthorizedUsers(request.getTargetProject().getFacade(),- ProjectPrivilege.READ);+ ProjectPrivilege.CODE_READ);for (PullRequestReview review: request.getReviews()) {if (review.getExcludeDate() == null && review.getResult() == null)users.remove(review.getUser().getFacade());diff --git a/core/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java b/core/src/main/java/io/onedev/server/web/component/reviewrequirement/ReviewRequirementAssistBehavior.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.javarename to core/src/main/java/io/onedev/server/web/component/reviewrequirement/ReviewRequirementAssistBehavior.javaindex 31a65cfaf3..73369f4752 100644--- a/core/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java+++ b/core/src/main/java/io/onedev/server/web/component/reviewrequirement/ReviewRequirementAssistBehavior.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.reviewrequirementspec;+package io.onedev.server.web.component.reviewrequirement;import java.util.ArrayList;import java.util.Iterator;@@ -13,16 +13,16 @@ import io.onedev.codeassist.FenceAware;import io.onedev.codeassist.InputSuggestion;import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.codeassist.grammar.RuleRefElementSpec;-import io.onedev.codeassist.parser.TerminalExpect;import io.onedev.codeassist.parser.ParseExpect;+import io.onedev.codeassist.parser.TerminalExpect;import io.onedev.server.model.Project;-import io.onedev.server.security.ProjectPrivilege;-import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser;+import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@SuppressWarnings("serial")-public class ReviewRequirementSpecAssistBehavior extends ANTLRAssistBehavior {+public class ReviewRequirementAssistBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;@@ -32,8 +32,8 @@ public class ReviewRequirementSpecAssistBehavior extends ANTLRAssistBehavior {private static final String ESCAPE_CHARS = "\\()";- public ReviewRequirementSpecAssistBehavior(IModel<Project> projectModel) {- super(ReviewRequirementSpecParser.class, "spec", false);+ public ReviewRequirementAssistBehavior(IModel<Project> projectModel) {+ super(ReviewRequirementParser.class, "requirement", false);this.projectModel = projectModel;}@@ -52,11 +52,12 @@ public class ReviewRequirementSpecAssistBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String unfencedMatchWith) {+ Project project = projectModel.getObject();if (terminalExpect.findExpectByRule("userCriteria") != null) {- return SuggestionUtils.suggestUser(projectModel.getObject(), ProjectPrivilege.READ,+ return SuggestionUtils.suggestUser(project, ProjectPrivilege.CODE_READ,unfencedMatchWith, ESCAPE_CHARS);} else {- return SuggestionUtils.suggestGroup(unfencedMatchWith, ESCAPE_CHARS);+ return SuggestionUtils.suggestTeam(project, unfencedMatchWith, ESCAPE_CHARS);}}diff --git a/core/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecInput.java b/core/src/main/java/io/onedev/server/web/component/reviewrequirement/ReviewRequirementInput.javasimilarity index 81%rename from core/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecInput.javarename to core/src/main/java/io/onedev/server/web/component/reviewrequirement/ReviewRequirementInput.javaindex 35e779f4b3..f8b700e68c 100644--- a/core/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecInput.java+++ b/core/src/main/java/io/onedev/server/web/component/reviewrequirement/ReviewRequirementInput.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.reviewrequirementspec;+package io.onedev.server.web.component.reviewrequirement;import java.io.Serializable;@@ -14,11 +14,11 @@ import io.onedev.server.model.Project;import io.onedev.server.util.reviewrequirement.ReviewRequirement;@SuppressWarnings("serial")-public class ReviewRequirementSpecInput extends TextField<String> {+public class ReviewRequirementInput extends TextField<String> {private final IModel<Project> projectModel;- public ReviewRequirementSpecInput(String id, IModel<Project> projectModel, IModel<String> specModel) {+ public ReviewRequirementInput(String id, IModel<Project> projectModel, IModel<String> specModel) {super(id, specModel);this.projectModel = projectModel;@@ -28,7 +28,7 @@ public class ReviewRequirementSpecInput extends TextField<String> {protected void onInitialize() {super.onInitialize();- add(new ReviewRequirementSpecAssistBehavior(projectModel));+ add(new ReviewRequirementAssistBehavior(projectModel));add(new IValidator<String>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/teamchoice/AbstractTeamChoiceProvider.javasimilarity index 56%rename from core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.javarename to core/src/main/java/io/onedev/server/web/component/teamchoice/AbstractTeamChoiceProvider.javaindex b9a2821cc7..75cdde801f 100644--- a/core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/teamchoice/AbstractTeamChoiceProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.groupchoice;+package io.onedev.server.web.component.teamchoice;import java.util.Collection;import java.util.List;@@ -10,28 +10,28 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.manager.CacheManager;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.facade.TeamFacade;import io.onedev.server.web.component.select2.ChoiceProvider;-public abstract class AbstractGroupChoiceProvider extends ChoiceProvider<GroupFacade> {+public abstract class AbstractTeamChoiceProvider extends ChoiceProvider<TeamFacade> {private static final long serialVersionUID = 1L;@Override- public void toJson(GroupFacade choice, JSONWriter writer) throws JSONException {+ public void toJson(TeamFacade choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId()).key("name").value(choice.getName());}@Override- public Collection<GroupFacade> toChoices(Collection<String> ids) {- List<GroupFacade> groups = Lists.newArrayList();+ public Collection<TeamFacade> toChoices(Collection<String> ids) {+ List<TeamFacade> teams = Lists.newArrayList();CacheManager cacheManager = OneDev.getInstance(CacheManager.class);for (String each : ids) {Long id = Long.valueOf(each);- groups.add(cacheManager.getGroup(id));+ teams.add(cacheManager.getTeam(id));}- return groups;+ return teams;}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamChoiceProvider.javanew file mode 100644index 0000000000..86d065bcd9--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamChoiceProvider.java@@ -0,0 +1,39 @@+package io.onedev.server.web.component.teamchoice;++import java.util.ArrayList;+import java.util.Comparator;+import java.util.List;++import io.onedev.server.util.facade.TeamFacade;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.component.select2.Response;+import io.onedev.server.web.component.select2.ResponseFiller;+import io.onedev.utils.matchscore.MatchScoreProvider;+import io.onedev.utils.matchscore.MatchScoreUtils;++public class TeamChoiceProvider extends AbstractTeamChoiceProvider {++ private static final long serialVersionUID = 1L;++ private final List<TeamFacade> choices;++ public TeamChoiceProvider(List<TeamFacade> choices) {+ this.choices = new ArrayList<>(choices);+ this.choices.sort(Comparator.comparing(TeamFacade::getName));+ }++ @Override+ public void query(String term, int page, Response<TeamFacade> response) {+ List<TeamFacade> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<TeamFacade>() {++ @Override+ public double getMatchScore(TeamFacade object) {+ return MatchScoreUtils.getMatchScore(object.getName(), term);+ }++ });++ new ResponseFiller<TeamFacade>(response).fill(matched, page, WebConstants.PAGE_SIZE);+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamChoiceResourceReference.java b/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamChoiceResourceReference.javanew file mode 100644index 0000000000..637b41f7eb--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamChoiceResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.teamchoice;++import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class TeamChoiceResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public TeamChoiceResourceReference() {+ super(TeamChoiceResourceReference.class, "team-choice.js");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamMultiChoice.java b/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamMultiChoice.javanew file mode 100644index 0000000000..f5b6810f6e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamMultiChoice.java@@ -0,0 +1,37 @@+package io.onedev.server.web.component.teamchoice;++import java.util.Collection;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.model.IModel;++import io.onedev.server.util.facade.TeamFacade;+import io.onedev.server.web.component.select2.Select2MultiChoice;++@SuppressWarnings("serial")+public class TeamMultiChoice extends Select2MultiChoice<TeamFacade> {++ public TeamMultiChoice(String id, IModel<Collection<TeamFacade>> teamsModel,+ AbstractTeamChoiceProvider choiceProvider) {+ super(id, teamsModel, choiceProvider);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (isRequired())+ getSettings().setPlaceholder("Choose teams ...");+ getSettings().setFormatResult("onedev.server.teamChoiceFormatter.formatResult");+ getSettings().setFormatSelection("onedev.server.teamChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("onedev.server.teamChoiceFormatter.escapeMarkup");+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new TeamChoiceResourceReference()));+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamSingleChoice.java b/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamSingleChoice.javanew file mode 100644index 0000000000..5a384e40d5--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamSingleChoice.java@@ -0,0 +1,41 @@+package io.onedev.server.web.component.teamchoice;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.model.IModel;++import io.onedev.server.util.facade.TeamFacade;+import io.onedev.server.web.component.select2.Select2Choice;++@SuppressWarnings("serial")+public class TeamSingleChoice extends Select2Choice<TeamFacade> {++ public TeamSingleChoice(String id, IModel<TeamFacade> teamModel,+ AbstractTeamChoiceProvider choiceProvider) {+ super(id, teamModel, choiceProvider);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (isRequired())+ getSettings().setPlaceholder("Choose a team ...");+ getSettings().setFormatResult("onedev.server.teamChoiceFormatter.formatResult");+ getSettings().setFormatSelection("onedev.server.teamChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("onedev.server.teamChoiceFormatter.escapeMarkup");+ }++ @Override+ protected void onBeforeRender() {+ getSettings().setAllowClear(!isRequired());+ super.onBeforeRender();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new TeamChoiceResourceReference()));+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/groupchoice/group-choice.js b/core/src/main/java/io/onedev/server/web/component/teamchoice/team-choice.jssimilarity index 80%rename from core/src/main/java/io/onedev/server/web/component/groupchoice/group-choice.jsrename to core/src/main/java/io/onedev/server/web/component/teamchoice/team-choice.jsindex c46cb7b1e8..b066f1fea2 100644--- a/core/src/main/java/io/onedev/server/web/component/groupchoice/group-choice.js+++ b/core/src/main/java/io/onedev/server/web/component/teamchoice/team-choice.js@@ -1,4 +1,4 @@-onedev.server.groupChoiceFormatter = {+onedev.server.teamChoiceFormatter = {formatSelection: function(group) {return group.name;},diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/ReviewRequirementSpec.java b/core/src/main/java/io/onedev/server/web/editable/annotation/ReviewRequirement.javasimilarity index 75%rename from core/src/main/java/io/onedev/server/web/editable/annotation/ReviewRequirementSpec.javarename to core/src/main/java/io/onedev/server/web/editable/annotation/ReviewRequirement.javaindex 1028a5269a..3e2fabb536 100644--- a/core/src/main/java/io/onedev/server/web/editable/annotation/ReviewRequirementSpec.java+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/ReviewRequirement.java@@ -8,12 +8,12 @@ import java.lang.annotation.Target;import javax.validation.Constraint;import javax.validation.Payload;-import io.onedev.server.util.validation.ReviewRequirementSpecValidator;+import io.onedev.server.util.validation.ReviewRequirementValidator;@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=ReviewRequirementSpecValidator.class)-public @interface ReviewRequirementSpec {+@Constraint(validatedBy=ReviewRequirementValidator.class)+public @interface ReviewRequirement {String message() default "Malformed review requirement spec";diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/GroupChoice.java b/core/src/main/java/io/onedev/server/web/editable/annotation/TeamChoice.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/web/editable/annotation/GroupChoice.javarename to core/src/main/java/io/onedev/server/web/editable/annotation/TeamChoice.javaindex a8d702839b..8e6a004267 100644--- a/core/src/main/java/io/onedev/server/web/editable/annotation/GroupChoice.java+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/TeamChoice.java@@ -7,6 +7,6 @@ import java.lang.annotation.Target;@Target(ElementType.METHOD)@Retention(RetentionPolicy.RUNTIME)-public @interface GroupChoice {+public @interface TeamChoice {String value() default "";}diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javadeleted file mode 100644index 55fc1ab70e..0000000000--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ /dev/null@@ -1,115 +0,0 @@-package io.onedev.server.web.editable.groupchoice;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;--import com.google.common.base.Preconditions;--import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.model.Group;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;-import io.onedev.server.web.component.groupchoice.GroupMultiChoice;-import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.annotation.GroupChoice;-import io.onedev.server.web.util.ComponentContext;-import io.onedev.utils.ReflectionUtils;--@SuppressWarnings("serial")-public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {-- private final List<GroupFacade> choices = new ArrayList<>();-- private GroupMultiChoice input;-- public GroupMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Collection<String>> propertyModel) {- super(id, propertyDescriptor, propertyModel);- }-- @SuppressWarnings({ "rawtypes", "unchecked" })- @Override- protected void onInitialize() {- super.onInitialize();-- OneContext oneContext = new ComponentContext(this);-- OneContext.push(oneContext);- try {- GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);- Preconditions.checkNotNull(groupChoice);- if (groupChoice.value().length() != 0) {- choices.addAll((List<GroupFacade>)ReflectionUtils- .invokeStaticMethod(descriptor.getBeanClass(), groupChoice.value()));- } else {- choices.addAll(OneDev.getInstance(CacheManager.class).getGroups().values());- }- } finally {- OneContext.pop();- }-- List<GroupFacade> groups = new ArrayList<>();- if (getModelObject() != null) {- GroupManager groupManager = OneDev.getInstance(GroupManager.class);- for (String groupName: getModelObject()) {- Group group = groupManager.find(groupName);- if (group != null && choices.contains(group.getFacade()))- groups.add(group.getFacade());- }- }-- input = new GroupMultiChoice("input", new Model((Serializable)groups), new GroupChoiceProvider(choices)) {-- @Override- protected void onInitialize() {- super.onInitialize();- getSettings().configurePlaceholder(descriptor, this);- }-- };- input.setConvertEmptyInputStringToNull(true);- input.setRequired(descriptor.isPropertyRequired());- input.setLabel(Model.of(getDescriptor().getDisplayName(this)));-- input.add(new AjaxFormComponentUpdatingBehavior("change"){-- @Override- protected void onUpdate(AjaxRequestTarget target) {- onPropertyUpdating(target);- }-- });-- add(input);- }-- @Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- return null;- }-- @Override- protected List<String> convertInputToValue() throws ConversionException {- List<String> groupNames = new ArrayList<>();- Collection<GroupFacade> groups = input.getConvertedInput();- if (groups != null) {- for (GroupFacade group: groups)- groupNames.add(group.getName());- }- return groupNames;- }--}diff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.javaindex 624205c1a9..8f7d7b4260 100644--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java@@ -12,7 +12,7 @@ import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;-import io.onedev.server.web.editable.annotation.ReviewRequirementSpec;+import io.onedev.server.web.editable.annotation.ReviewRequirement;@SuppressWarnings("serial")public class ReviewRequirementSpecEditSupport implements EditSupport {@@ -20,7 +20,7 @@ public class ReviewRequirementSpecEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(ReviewRequirementSpec.class) != null) {+ if (propertyGetter.getAnnotation(ReviewRequirement.class) != null) {if (propertyGetter.getReturnType() != String.class) {throw new RuntimeException("Annotation 'ReviewRequirementSpec' should be applied to property "+ "with type 'String'.");diff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.javaindex 89ea8a8f52..58d25a7c32 100644--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java@@ -8,7 +8,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.reviewrequirementspec.ReviewRequirementSpecInput;+import io.onedev.server.web.component.reviewrequirement.ReviewRequirementInput;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;@@ -18,7 +18,7 @@ import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class ReviewRequirementSpecEditor extends PropertyEditor<String> {- private ReviewRequirementSpecInput input;+ private ReviewRequirementInput input;public ReviewRequirementSpecEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {super(id, propertyDescriptor, propertyModel);@@ -28,7 +28,7 @@ public class ReviewRequirementSpecEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- input = new ReviewRequirementSpecInput("input", new AbstractReadOnlyModel<Project>() {+ input = new ReviewRequirementInput("input", new AbstractReadOnlyModel<Project>() {@Overridepublic Project getObject() {diff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.javaindex c3671f1674..55222e7d86 100644--- a/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java@@ -14,13 +14,13 @@ import io.onedev.server.web.editable.PropertyViewer;import io.onedev.server.web.editable.annotation.BranchPattern;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Color;-import io.onedev.server.web.editable.annotation.GroupChoice;+import io.onedev.server.web.editable.annotation.TeamChoice;import io.onedev.server.web.editable.annotation.IssueQuery;import io.onedev.server.web.editable.annotation.Markdown;import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.Password;import io.onedev.server.web.editable.annotation.PathPattern;-import io.onedev.server.web.editable.annotation.ReviewRequirementSpec;+import io.onedev.server.web.editable.annotation.ReviewRequirement;import io.onedev.server.web.editable.annotation.Script;import io.onedev.server.web.editable.annotation.TagPattern;import io.onedev.server.web.editable.annotation.UserChoice;@@ -40,10 +40,10 @@ public class StringEditSupport implements EditSupport {&& descriptor.getPropertyGetter().getAnnotation(BranchPattern.class) == null&& descriptor.getPropertyGetter().getAnnotation(TagPattern.class) == null&& descriptor.getPropertyGetter().getAnnotation(IssueQuery.class) == null- && descriptor.getPropertyGetter().getAnnotation(GroupChoice.class) == null+ && descriptor.getPropertyGetter().getAnnotation(TeamChoice.class) == null&& descriptor.getPropertyGetter().getAnnotation(UserChoice.class) == null&& descriptor.getPropertyGetter().getAnnotation(PathPattern.class) == null- && descriptor.getPropertyGetter().getAnnotation(ReviewRequirementSpec.class) == null) {+ && descriptor.getPropertyGetter().getAnnotation(ReviewRequirement.class) == null) {return new PropertyContext<String>(descriptor) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamEditSupport.javasimilarity index 73%rename from core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.javarename to core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamEditSupport.javaindex fc3f3e3ee4..0a2752ce31 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.groupchoice;+package io.onedev.server.web.editable.teamchoice;import java.lang.reflect.Method;import java.util.Collection;@@ -15,15 +15,15 @@ import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;-import io.onedev.server.web.editable.annotation.GroupChoice;+import io.onedev.server.web.editable.annotation.TeamChoice;@SuppressWarnings("serial")-public class GroupEditSupport implements EditSupport {+public class TeamEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(GroupChoice.class) != null) {+ if (propertyGetter.getAnnotation(TeamChoice.class) != null) {if (Collection.class.isAssignableFrom(propertyGetter.getReturnType())&& EditableUtils.getElementClass(propertyGetter.getGenericReturnType()) == String.class) {return new PropertyContext<Collection<String>>(descriptor) {@@ -34,9 +34,9 @@ public class GroupEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- Collection<String> groupNames = model.getObject();- if (groupNames != null && !groupNames.isEmpty()) {- return new Label(id, StringUtils.join(groupNames, ", " ));+ Collection<String> teamNames = model.getObject();+ if (teamNames != null && !teamNames.isEmpty()) {+ return new Label(id, StringUtils.join(teamNames, ", " ));} else {return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -47,7 +47,7 @@ public class GroupEditSupport implements EditSupport {@Overridepublic PropertyEditor<Collection<String>> renderForEdit(String componentId, IModel<Collection<String>> model) {- return new GroupMultiChoiceEditor(componentId, descriptor, model);+ return new TeamMultiChoiceEditor(componentId, descriptor, model);}};@@ -60,9 +60,9 @@ public class GroupEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- String groupName = model.getObject();- if (groupName != null) {- return new Label(id, groupName);+ String teamName = model.getObject();+ if (teamName != null) {+ return new Label(id, teamName);} else {return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -73,12 +73,12 @@ public class GroupEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new GroupSingleChoiceEditor(componentId, descriptor, model);+ return new TeamSingleChoiceEditor(componentId, descriptor, model);}};} else {- throw new RuntimeException("Annotation 'GroupChoice' should be applied to property with type String or Collection<String>");+ throw new RuntimeException("Annotation 'TeamChoice' should be applied to property with type String or Collection<String>");}} else {return null;diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamMultiChoiceEditor.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.htmlrename to core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamMultiChoiceEditor.htmldiff --git a/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamMultiChoiceEditor.javanew file mode 100644index 0000000000..8f2eea121a--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamMultiChoiceEditor.java@@ -0,0 +1,121 @@+package io.onedev.server.web.editable.teamchoice;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import com.google.common.base.Preconditions;++import io.onedev.server.OneDev;+import io.onedev.server.manager.CacheManager;+import io.onedev.server.manager.TeamManager;+import io.onedev.server.model.Team;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.facade.TeamFacade;+import io.onedev.server.web.component.teamchoice.TeamChoiceProvider;+import io.onedev.server.web.component.teamchoice.TeamMultiChoice;+import io.onedev.server.web.editable.ErrorContext;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.TeamChoice;+import io.onedev.server.web.util.ComponentContext;+import io.onedev.utils.ReflectionUtils;++@SuppressWarnings("serial")+public class TeamMultiChoiceEditor extends PropertyEditor<Collection<String>> {++ private final List<TeamFacade> choices = new ArrayList<>();++ private TeamMultiChoice input;++ public TeamMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Collection<String>> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @SuppressWarnings({ "rawtypes", "unchecked" })+ @Override+ protected void onInitialize() {+ super.onInitialize();++ OneContext oneContext = new ComponentContext(this);++ List<TeamFacade> teams = new ArrayList<>();+ OneContext.push(oneContext);+ try {+ TeamChoice teamChoice = descriptor.getPropertyGetter().getAnnotation(TeamChoice.class);+ Preconditions.checkNotNull(teamChoice);+ if (teamChoice.value().length() != 0) {+ choices.addAll((List<TeamFacade>)ReflectionUtils+ .invokeStaticMethod(descriptor.getBeanClass(), teamChoice.value()));+ } else {+ choices.addAll(OneDev.getInstance(CacheManager.class).getTeams().values());+ }+ for (Iterator<TeamFacade> it = choices.iterator(); it.hasNext();) {+ if (!it.next().getProjectId().equals(OneContext.get().getProject().getId()))+ it.remove();+ }++ teams = new ArrayList<>();+ if (getModelObject() != null) {+ TeamManager teamManager = OneDev.getInstance(TeamManager.class);+ for (String teamName: getModelObject()) {+ Team team = teamManager.find(OneContext.get().getProject(), teamName);+ if (team != null && choices.contains(team.getFacade()))+ teams.add(team.getFacade());+ }+ }+ } finally {+ OneContext.pop();+ }++ input = new TeamMultiChoice("input", new Model((Serializable)teams), new TeamChoiceProvider(choices)) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().configurePlaceholder(descriptor, this);+ }++ };+ input.setConvertEmptyInputStringToNull(true);+ input.setRequired(descriptor.isPropertyRequired());+ input.setLabel(Model.of(getDescriptor().getDisplayName(this)));++ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });++ add(input);+ }++ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ return null;+ }++ @Override+ protected List<String> convertInputToValue() throws ConversionException {+ List<String> teamNames = new ArrayList<>();+ Collection<TeamFacade> teams = input.getConvertedInput();+ if (teams != null) {+ for (TeamFacade team: teams)+ teamNames.add(team.getName());+ }+ return teamNames;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamSingleChoiceEditor.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.htmlrename to core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamSingleChoiceEditor.htmldiff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamSingleChoiceEditor.javasimilarity index 52%rename from core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javarename to core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamSingleChoiceEditor.javaindex b44473e948..031fc7a3de 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamSingleChoiceEditor.java@@ -1,6 +1,7 @@-package io.onedev.server.web.editable.groupchoice;+package io.onedev.server.web.editable.teamchoice;import java.util.ArrayList;+import java.util.Iterator;import java.util.List;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -13,28 +14,28 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.model.Group;+import io.onedev.server.manager.TeamManager;+import io.onedev.server.model.Team;import io.onedev.server.util.OneContext;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;-import io.onedev.server.web.component.groupchoice.GroupSingleChoice;+import io.onedev.server.util.facade.TeamFacade;+import io.onedev.server.web.component.teamchoice.TeamChoiceProvider;+import io.onedev.server.web.component.teamchoice.TeamSingleChoice;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.annotation.GroupChoice;+import io.onedev.server.web.editable.annotation.TeamChoice;import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")-public class GroupSingleChoiceEditor extends PropertyEditor<String> {+public class TeamSingleChoiceEditor extends PropertyEditor<String> {- private final List<GroupFacade> choices = new ArrayList<>();+ private final List<TeamFacade> choices = new ArrayList<>();- private GroupSingleChoice input;+ private TeamSingleChoice input;- public GroupSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {+ public TeamSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {super(id, propertyDescriptor, propertyModel);}@@ -43,35 +44,40 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();+ TeamFacade facade;+OneContext oneContext = new ComponentContext(this);-OneContext.push(oneContext);try {- GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);- Preconditions.checkNotNull(groupChoice);- if (groupChoice.value().length() != 0) {- choices.addAll((List<GroupFacade>)ReflectionUtils- .invokeStaticMethod(descriptor.getBeanClass(), groupChoice.value()));+ TeamChoice teamChoice = descriptor.getPropertyGetter().getAnnotation(TeamChoice.class);+ Preconditions.checkNotNull(teamChoice);+ if (teamChoice.value().length() != 0) {+ choices.addAll((List<TeamFacade>)ReflectionUtils+ .invokeStaticMethod(descriptor.getBeanClass(), teamChoice.value()));} else {- choices.addAll(OneDev.getInstance(CacheManager.class).getGroups().values());+ choices.addAll(OneDev.getInstance(CacheManager.class).getTeams().values());}++ for (Iterator<TeamFacade> it = choices.iterator(); it.hasNext();) {+ if (!it.next().getProjectId().equals(OneContext.get().getProject().getId()))+ it.remove();+ }++ Team team;+ if (getModelObject() != null)+ team = OneDev.getInstance(TeamManager.class).find(OneContext.get().getProject(), getModelObject());+ else+ team = null;++ if (team != null && choices.contains(team.getFacade()))+ facade = team.getFacade();+ else+ facade = null;} finally {OneContext.pop();}- Group group;- if (getModelObject() != null)- group = OneDev.getInstance(GroupManager.class).find(getModelObject());- else- group = null;-- GroupFacade facade;- if (group != null && choices.contains(group.getFacade()))- facade = group.getFacade();- else- facade = null;-- input = new GroupSingleChoice("input", Model.of(facade), new GroupChoiceProvider(choices)) {+ input = new TeamSingleChoice("input", Model.of(facade), new TeamChoiceProvider(choices)) {@Overrideprotected void onInitialize() {@@ -104,9 +110,9 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected String convertInputToValue() throws ConversionException {- GroupFacade group = input.getConvertedInput();- if (group != null)- return group.getName();+ TeamFacade team = input.getConvertedInput();+ if (team != null)+ return team.getName();elsereturn null;}diff --git a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.javaindex c44d21a2fb..a607f444bf 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java@@ -88,9 +88,9 @@ public class AuthenticatorPage extends AdministrationPage {.append(authenticated.getEmail()).append("\n");}- if (authenticated.getGroupNames() != null) {+ if (authenticated.getTeamFQNs() != null) {retrievedInfoBuilder.append("Groups: ")- .append(Joiner.on(", ").join(authenticated.getGroupNames()))+ .append(Joiner.on(", ").join(authenticated.getTeamFQNs())).append("\n");}StringBuilder messageBuilder =diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.html b/core/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.htmldeleted file mode 100644index 9440edc6b5..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.html+++ /dev/null@@ -1,22 +0,0 @@-<wicket:extend>- <div class="authorization list">- <div class="head clearfix">- <div class="pull-left clearable-wrapper">- <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></input>- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>- </div>- <div class="pull-left">- <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>- </div>- </div>- <table wicket:id="authorizations" class="authorizations table table-hover table-condensed"></table>- </div>- <wicket:fragment wicket:id="projectFrag">- <a wicket:id="project"></a>- </wicket:fragment>- <wicket:fragment wicket:id="privilegeFrag">- <a wicket:id="dropdown" class="btn btn-xs btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.javadeleted file mode 100644index d622da4738..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.java+++ /dev/null@@ -1,308 +0,0 @@-package io.onedev.server.web.page.group;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-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.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.GroupAuthorizationManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.security.ProjectPrivilege;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.ProjectFacade;-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.selectioncolumn.SelectionColumn;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.projectchoice.AbstractProjectChoiceProvider;-import io.onedev.server.web.component.projectchoice.ProjectChoiceResourceReference;-import io.onedev.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel;-import io.onedev.server.web.component.select2.Response;-import io.onedev.server.web.component.select2.ResponseFiller;-import io.onedev.server.web.component.select2.SelectToAddChoice;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.utils.matchscore.MatchScoreProvider;-import io.onedev.utils.matchscore.MatchScoreUtils;--@SuppressWarnings("serial")-public class GroupAuthorizationsPage extends GroupPage {-- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private String searchInput;-- private DataTable<GroupAuthorization, Void> authorizationsTable;-- private SelectionColumn<GroupAuthorization, Void> selectionColumn;-- public GroupAuthorizationsPage(PageParameters params) {- super(params);- }-- private EntityCriteria<GroupAuthorization> getCriteria() {- EntityCriteria<GroupAuthorization> criteria = EntityCriteria.of(GroupAuthorization.class);- if (searchInput != null)- criteria.createCriteria("project").add(Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE));- criteria.add(Restrictions.eq("group", getGroup()));- return criteria;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("filterProjects", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(authorizationsTable);- }-- });-- add(new SelectToAddChoice<ProjectFacade>("addNew", new AbstractProjectChoiceProvider() {-- @Override- public void query(String term, int page, Response<ProjectFacade> response) {- List<ProjectFacade> notAuthorizedProjects = new ArrayList<>();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- Collection<Long> authorizedProjectIds = new HashSet<>();- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (authorization.getGroupId().equals(getGroup().getId()))- authorizedProjectIds.add(authorization.getProjectId());- }- for (ProjectFacade project: cacheManager.getProjects().values()) {- if (!authorizedProjectIds.contains(project.getId()))- notAuthorizedProjects.add(project);- }- Collections.sort(notAuthorizedProjects);- Collections.reverse(notAuthorizedProjects);-- MatchScoreProvider<ProjectFacade> matchScoreProvider = new MatchScoreProvider<ProjectFacade>() {-- @Override- public double getMatchScore(ProjectFacade object) {- return MatchScoreUtils.getMatchScore(object.getName(), term);- }-- };- notAuthorizedProjects = MatchScoreUtils.filterAndSort(notAuthorizedProjects, matchScoreProvider);-- new ResponseFiller<ProjectFacade>(response).fill(notAuthorizedProjects, page, WebConstants.PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Authorize project...");- getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult");- getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, ProjectFacade selection) {- GroupAuthorization authorization = new GroupAuthorization();- authorization.setGroup(getGroup());- authorization.setProject(OneDev.getInstance(ProjectManager.class).load(selection.getId()));- OneDev.getInstance(GroupAuthorizationManager.class).save(authorization);- target.add(authorizationsTable);- Session.get().success("Project added");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));- }-- });-- AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<GroupAuthorization> authorizationsToDelete = new HashSet<>();- for (IModel<GroupAuthorization> model: selectionColumn.getSelections()) {- authorizationsToDelete.add(model.getObject());- }- OneDev.getInstance(GroupAuthorizationManager.class).delete(authorizationsToDelete);- target.add(authorizationsTable);- selectionColumn.getSelections().clear();- target.add(this);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!selectionColumn.getSelections().isEmpty());- }-- };- deleteSelected.setOutputMarkupPlaceholderTag(true);- add(deleteSelected);-- List<IColumn<GroupAuthorization, Void>> columns = new ArrayList<>();-- selectionColumn = new SelectionColumn<GroupAuthorization, Void>() {-- @Override- protected void onSelectionChange(AjaxRequestTarget target) {- target.add(deleteSelected);- }-- };- columns.add(selectionColumn);-- columns.add(new AbstractColumn<GroupAuthorization, Void>(Model.of("Project")) {-- @Override- public void populateItem(Item<ICellPopulator<GroupAuthorization>> cellItem, String componentId,- IModel<GroupAuthorization> rowModel) {- GroupAuthorization authorization = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "projectFrag", GroupAuthorizationsPage.this);- fragment.add(new BookmarkablePageLink<Void>("project", ProjectBlobPage.class,- ProjectBlobPage.paramsOf(authorization.getProject())) {-- @Override- public IModel<?> getBody() {- return Model.of(rowModel.getObject().getProject().getName());- }-- });- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<GroupAuthorization, Void>(Model.of("Permission")) {-- @Override- public void populateItem(Item<ICellPopulator<GroupAuthorization>> cellItem, String componentId,- IModel<GroupAuthorization> rowModel) {- Fragment fragment = new Fragment(componentId, "privilegeFrag", GroupAuthorizationsPage.this);- WebMarkupContainer dropdown = new DropdownLink("dropdown") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, rowModel.getObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {- dropdown.close();- GroupAuthorization authorization = rowModel.getObject();- authorization.setPrivilege(privilege);- OneDev.getInstance(GroupAuthorizationManager.class).save(authorization);- target.add(fragment);- }-- };- }-- };- dropdown.add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return rowModel.getObject().getPrivilege().name();- }-- }));- fragment.add(dropdown);- fragment.setOutputMarkupId(true);- cellItem.add(fragment);- }- });-- SortableDataProvider<GroupAuthorization, Void> dataProvider = new SortableDataProvider<GroupAuthorization, Void>() {-- @Override- public Iterator<? extends GroupAuthorization> iterator(long first, long count) {- EntityCriteria<GroupAuthorization> criteria = getCriteria();- criteria.addOrder(Order.desc("id"));- return OneDev.getInstance(GroupAuthorizationManager.class).findRange(criteria, (int)first,- (int)count).iterator();- }-- @Override- public long size() {- return OneDev.getInstance(GroupAuthorizationManager.class).count(getCriteria());- }-- @Override- public IModel<GroupAuthorization> model(GroupAuthorization object) {- Long id = object.getId();- return new LoadableDetachableModel<GroupAuthorization>() {-- @Override- protected GroupAuthorization load() {- return OneDev.getInstance(GroupAuthorizationManager.class).load(id);- }-- };- }- };-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getGroup());- params.add(PARAM_CURRENT_PAGE, currentPage+1);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;- }-- };-- add(authorizationsTable = new HistoryAwareDataTable<GroupAuthorization, Void>("authorizations", columns,- dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport));- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/group/GroupCssResourceReference.javadeleted file mode 100644index 30600a87da..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.group;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class GroupCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public GroupCssResourceReference() {- super(GroupCssResourceReference.class, "group.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.html b/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.htmldeleted file mode 100644index 3f675f3446..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.html+++ /dev/null@@ -1,22 +0,0 @@-<wicket:extend>- <div class="group list">- <div class="head clearfix">- <div class="pull-left clearable-wrapper">- <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name"></input>- </div>- <div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New Group</a>- </div>- </div>- <div class="body">- <table wicket:id="groups" class="groups table table-hover"></table>- </div>- </div>- <wicket:fragment wicket:id="nameFrag">- <a wicket:id="name"></a>- </wicket:fragment>- <wicket:fragment wicket:id="actionFrag">- <a wicket:id="profile" title="Profile of this group"><i class="fa fa-cog"></i></a>- <a wicket:id="delete" title="Delete this group"><i class="fa fa-trash"></i></a>- </wicket:fragment>-</wicket:extend>diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.java b/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.javadeleted file mode 100644index 1fa42109d8..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.java+++ /dev/null@@ -1,252 +0,0 @@-package io.onedev.server.web.page.group;--import java.util.ArrayList;-import java.util.Iterator;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.model.Group;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ComponentRenderer;-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.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.layout.LayoutPage;-import io.onedev.server.web.util.ConfirmOnClick;-import io.onedev.server.web.util.PagingHistorySupport;--@SuppressWarnings("serial")-public class GroupListPage extends LayoutPage {-- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private DataTable<Group, Void> groupsTable;-- private String searchInput;-- private EntityCriteria<Group> getCriteria() {- EntityCriteria<Group> criteria = EntityCriteria.of(Group.class);- if (searchInput != null)- criteria.add(Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE));- return criteria;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;- add(searchField = new TextField<String>("filterGroups", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(groupsTable);- }-- });-- add(new Link<Void>("addNew") {-- @Override- public void onClick() {- setResponsePage(NewGroupPage.class);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.isAdministrator());- }-- });-- List<IColumn<Group, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<Group, Void>(Model.of("Name")) {-- @Override- public 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())) {-- @Override- public void onClick() {- setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(rowModel.getObject()));- }-- });- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<Group, Void>(Model.of("Is Administrator")) {-- @Override- public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,- IModel<Group> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().isAdministrator()));- }-- });-- columns.add(new AbstractColumn<Group, Void>(Model.of("Can Create Projects")) {-- @Override- public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,- IModel<Group> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().isCanCreateProjects()));- }-- });-- columns.add(new AbstractColumn<Group, Void>(Model.of("Actions")) {-- @Override- public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,- IModel<Group> rowModel) {- Fragment fragment = new Fragment(componentId, "actionFrag", GroupListPage.this);- fragment.add(AttributeAppender.append("class", "actions"));-- Group group = rowModel.getObject();-- fragment.add(new Link<Void>("profile") {-- @Override- public void onClick() {- setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(rowModel.getObject()));- }-- });- fragment.add(new Link<Void>("delete") {-- @Override- public void onClick() {- OneDev.getInstance(GroupManager.class).delete(rowModel.getObject());- setResponsePage(GroupListPage.class);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.isAdministrator());- }-- }.add(new ConfirmOnClick("Do you really want to delete group '" + group.getName() + "'?")));-- cellItem.add(fragment);- }-- });-- SortableDataProvider<Group, Void> dataProvider = new SortableDataProvider<Group, Void>() {-- @Override- public Iterator<? extends Group> iterator(long first, long count) {- EntityCriteria<Group> criteria = getCriteria();- criteria.addOrder(Order.asc("name"));- return OneDev.getInstance(GroupManager.class).findRange(criteria, (int)first, (int)count).iterator();- }-- @Override- public long size() {- return OneDev.getInstance(GroupManager.class).count(getCriteria());- }-- @Override- public IModel<Group> model(Group object) {- Long id = object.getId();- return new LoadableDetachableModel<Group>() {-- @Override- protected Group load() {- return OneDev.getInstance(GroupManager.class).load(id);- }-- };- }- };-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = new PageParameters();- params.add(PARAM_CURRENT_PAGE, currentPage+1);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;- }-- };-- add(groupsTable = new HistoryAwareDataTable<>("groups", columns, dataProvider,- WebConstants.PAGE_SIZE, pagingHistorySupport));- }-- @Override- protected List<ComponentRenderer> getBreadcrumbs() {- List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new ViewStateAwarePageLink<Void>(componentId, GroupListPage.class) {-- @Override- public IModel<?> getBody() {- return Model.of("Groups");- }-- };- }-- });-- return breadcrumbs;- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.isAdministrator();- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new GroupCssResourceReference()));- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.html b/core/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.htmldeleted file mode 100644index d4b3c96acf..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.html+++ /dev/null@@ -1,20 +0,0 @@-<wicket:extend>- <div class="membership list">- <div class="head clearfix">- <div class="pull-left clearable-wrapper">- <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by user name"></input>- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>- </div>- <div class="pull-left">- <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>- </div>- </div>- <table wicket:id="memberships" class="memberships table table-hover table-condensed"></table>- </div>- <wicket:fragment wicket:id="nameFrag">- <a wicket:id="avatarLink"></a>- <a wicket:id="nameLink"></a>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.java b/core/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.javadeleted file mode 100644index e3c185855e..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.java+++ /dev/null@@ -1,272 +0,0 @@-package io.onedev.server.web.page.group;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.MembershipManager;-import io.onedev.server.manager.UserManager;-import io.onedev.server.model.Membership;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.avatar.AvatarLink;-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;-import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;-import io.onedev.server.web.component.link.UserLink;-import io.onedev.server.web.component.select2.Response;-import io.onedev.server.web.component.select2.ResponseFiller;-import io.onedev.server.web.component.select2.SelectToAddChoice;-import io.onedev.server.web.component.userchoice.AbstractUserChoiceProvider;-import io.onedev.server.web.component.userchoice.UserChoiceResourceReference;-import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.utils.matchscore.MatchScoreProvider;-import io.onedev.utils.matchscore.MatchScoreUtils;--@SuppressWarnings("serial")-public class GroupMembershipsPage extends GroupPage {-- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private String searchInput;-- private DataTable<Membership, Void> membershipsTable;-- private SelectionColumn<Membership, Void> selectionColumn;-- public GroupMembershipsPage(PageParameters params) {- super(params);- }-- private EntityCriteria<Membership> getCriteria() {- EntityCriteria<Membership> criteria = EntityCriteria.of(Membership.class);- if (searchInput != null)- criteria.createCriteria("user").add(Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE));- criteria.add(Restrictions.eq("group", getGroup()));- return criteria;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("filterUsers", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(membershipsTable);- }-- });-- add(new SelectToAddChoice<UserFacade>("addNew", new AbstractUserChoiceProvider() {-- @Override- public void query(String term, int page, Response<UserFacade> response) {- List<UserFacade> nonMembers = new ArrayList<>();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- Set<Long> memberIds = new HashSet<>();- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (membership.getGroupId().equals(getGroup().getId()))- memberIds.add(membership.getUserId());- }- for (UserFacade user: cacheManager.getUsers().values()) {- if (!memberIds.contains(user.getId()))- nonMembers.add(user);- }- Collections.sort(nonMembers);- Collections.reverse(nonMembers);-- nonMembers = MatchScoreUtils.filterAndSort(nonMembers, new MatchScoreProvider<UserFacade>() {-- @Override- public double getMatchScore(UserFacade object) {- return object.getMatchScore(term);- }-- });-- new ResponseFiller<>(response).fill(nonMembers, page, WebConstants.PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add member...");- getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult");- getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, UserFacade selection) {- Membership membership = new Membership();- membership.setGroup(getGroup());- membership.setUser(OneDev.getInstance(UserManager.class).load(selection.getId()));- OneDev.getInstance(MembershipManager.class).save(membership);- target.add(membershipsTable);- Session.get().success("Member added");- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.isAdministrator());- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));- }-- });-- AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<Membership> membershipsToDelete = new HashSet<>();- for (IModel<Membership> model: selectionColumn.getSelections()) {- membershipsToDelete.add(model.getObject());- }- OneDev.getInstance(MembershipManager.class).delete(membershipsToDelete);- target.add(membershipsTable);- selectionColumn.getSelections().clear();- target.add(this);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!selectionColumn.getSelections().isEmpty());- }-- };- deleteSelected.setOutputMarkupPlaceholderTag(true);- add(deleteSelected);-- List<IColumn<Membership, Void>> columns = new ArrayList<>();-- selectionColumn = new SelectionColumn<Membership, Void>() {-- @Override- protected void onSelectionChange(AjaxRequestTarget target) {- target.add(deleteSelected);- }-- };- if (SecurityUtils.isAdministrator())- columns.add(selectionColumn);-- columns.add(new AbstractColumn<Membership, Void>(Model.of("Name")) {-- @Override- public void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,- IModel<Membership> rowModel) {- Membership membership = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "nameFrag", GroupMembershipsPage.this);- fragment.add(new AvatarLink("avatarLink", membership.getUser()));- fragment.add(new UserLink("nameLink", membership.getUser()));- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<Membership, Void>(Model.of("Email")) {-- @Override- public void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,- IModel<Membership> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getUser().getEmail()));- }- });-- SortableDataProvider<Membership, Void> dataProvider = new SortableDataProvider<Membership, Void>() {-- @Override- public Iterator<? extends Membership> iterator(long first, long count) {- EntityCriteria<Membership> criteria = getCriteria();- criteria.addOrder(Order.desc("id"));- return OneDev.getInstance(MembershipManager.class).findRange(criteria, (int)first,- (int)count).iterator();- }-- @Override- public long size() {- return OneDev.getInstance(MembershipManager.class).count(getCriteria());- }-- @Override- public IModel<Membership> model(Membership object) {- Long id = object.getId();- return new LoadableDetachableModel<Membership>() {-- @Override- protected Membership load() {- return OneDev.getInstance(MembershipManager.class).load(id);- }-- };- }- };-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getGroup());- params.add(PARAM_CURRENT_PAGE, currentPage+1);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;- }-- };-- add(membershipsTable = new HistoryAwareDataTable<Membership, Void>("memberships", columns, dataProvider,- WebConstants.PAGE_SIZE, pagingHistorySupport));- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupPage.html b/core/src/main/java/io/onedev/server/web/page/group/GroupPage.htmldeleted file mode 100644index 7c93591511..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupPage.html+++ /dev/null@@ -1,8 +0,0 @@-<wicket:extend>- <div id="group">- <div wicket:id="sidebar"></div>- <div class="content">- <wicket:child></wicket:child>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupPage.java b/core/src/main/java/io/onedev/server/web/page/group/GroupPage.javadeleted file mode 100644index 7da5f3302d..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupPage.java+++ /dev/null@@ -1,126 +0,0 @@-package io.onedev.server.web.page.group;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.basic.Label;-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.manager.GroupManager;-import io.onedev.server.model.Group;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ComponentRenderer;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.sidebar.SideBar;-import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.page.layout.LayoutPage;-import io.onedev.server.web.util.model.EntityModel;--@SuppressWarnings("serial")-public abstract class GroupPage extends LayoutPage {-- private static final String PARAM_GROUP = "group";-- protected final IModel<Group> groupModel;-- public GroupPage(PageParameters params) {- super(params);-- Long groupId = params.get(PARAM_GROUP).toLong();-- Group group = OneDev.getInstance(GroupManager.class).load(groupId);- groupModel = new EntityModel<Group>(group);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new SideBar("sidebar", "group.miniSidebar") {-- @Override- protected List<? extends Tab> newTabs() {- List<PageTab> tabs = new ArrayList<>();-- tabs.add(new GroupTab("Profile", "fa fa-fw fa-list-alt", GroupProfilePage.class));- tabs.add(new GroupTab("Members", "fa fa-fw fa-user", GroupMembershipsPage.class));- if (SecurityUtils.isAdministrator() && !getGroup().isAdministrator())- tabs.add(new GroupTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", GroupAuthorizationsPage.class));- return tabs;- }-- });- }-- @Override- protected void onDetach() {- groupModel.detach();-- super.onDetach();- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new GroupCssResourceReference()));- }-- public Group getGroup() {- return groupModel.getObject();- }-- public static PageParameters paramsOf(Group group) {- PageParameters params = new PageParameters();- params.add(PARAM_GROUP, group.getId());- return params;- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.isAdministrator();- }-- @Override- protected List<ComponentRenderer> getBreadcrumbs() {- List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new ViewStateAwarePageLink<Void>(componentId, GroupListPage.class) {-- @Override- public IModel<?> getBody() {- return Model.of("Groups");- }-- };- }-- });-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- Label label = new Label(componentId, getGroup().getName());- label.add(AttributeAppender.append("class", "name"));- label.add(AttributeAppender.append("title", getGroup().getName()));- return label;- }-- });-- return breadcrumbs;- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.html b/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.htmldeleted file mode 100644index d7fcd6b547..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.html+++ /dev/null@@ -1,24 +0,0 @@-<wicket:extend>- <div wicket:id="content" class="profile"></div>- <wicket:fragment wicket:id="editFrag">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="editor"></div>- <div class="checkbox">- <label>- <input wicket:id="administrator" type="checkbox"/> Is Administrator- <div class="help-block">Members of administrator group have administrative rights over the whole system</div>- </label>- </div>- <div class="checkbox">- <label>- <input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects- <div class="help-block">Check this to make members of this group able to fork/create projects</div>- </label>- </div>- <div class="actions clearfix">- <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input>- <a wicket:id="delete" class="btn btn-danger pull-right">Delete</a>- </div>- </form>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java b/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.javadeleted file mode 100644index 7165fbadb9..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java+++ /dev/null@@ -1,149 +0,0 @@-package io.onedev.server.web.page.group;--import java.io.Serializable;--import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;-import org.apache.wicket.markup.html.form.CheckBox;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.google.common.collect.Sets;--import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.model.Group;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;-import io.onedev.server.web.util.ConfirmOnClick;--@SuppressWarnings("serial")-public class GroupProfilePage extends GroupPage {-- private BeanEditor editor;-- private CheckBox administratorInput;-- private CheckBox canCreateProjectsInput;-- private String oldName;-- public GroupProfilePage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- if (SecurityUtils.isAdministrator()) {- Fragment fragment = new Fragment("content", "editFrag", this);- editor = BeanContext.editModel("editor", new IModel<Serializable>() {-- @Override- public void detach() {- }-- @Override- public Serializable getObject() {- return getGroup();- }-- @Override- public void setObject(Serializable object) {- // check contract of GroupManager.save on why we assign oldName here- oldName = getGroup().getName();- editor.getBeanDescriptor().copyProperties(object, getGroup());- }-- }, Sets.newHashSet("administrator", "canCreateProjects"), true);-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- Group group = getGroup();- group.setAdministrator(administratorInput.getModelObject());- if (group.isAdministrator())- group.setCanCreateProjects(true);- else- group.setCanCreateProjects(canCreateProjectsInput.getModelObject());- GroupManager groupManager = OneDev.getInstance(GroupManager.class);- Group groupWithSameName = groupManager.find(group.getName());- if (groupWithSameName != null && !groupWithSameName.equals(group)) {- editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another group.");- }- if (!editor.hasErrors(true)) {- groupManager.save(group, oldName);- setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(group));- Session.get().success("Profile updated");- }- }-- };- form.add(editor);-- administratorInput = new CheckBox("administrator", Model.of(getGroup().isAdministrator()));- administratorInput.add(new OnChangeAjaxBehavior() {-- @Override- protected void onUpdate(AjaxRequestTarget target) {- if (administratorInput.getModelObject())- canCreateProjectsInput.setModelObject(true);- target.add(canCreateProjectsInput);- }-- });- form.add(administratorInput);-- canCreateProjectsInput = new CheckBox("canCreateProjects", Model.of(getGroup().isCanCreateProjects())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(!administratorInput.getModelObject());- }-- };- canCreateProjectsInput.setOutputMarkupId(true);- form.add(canCreateProjectsInput);-- form.add(new Link<Void>("delete") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(SecurityUtils.isAdministrator());- }-- @Override- public void onClick() {- OneDev.getInstance(GroupManager.class).delete(getGroup());- setResponsePage(GroupListPage.class);- }-- }.add(new ConfirmOnClick("Do you really want to delete group '" + getGroup().getName() + "'?")));-- fragment.add(form);- add(fragment);- } else {- Group group = new Group();- new BeanDescriptor(Group.class).copyProperties(getGroup(), group);- add(BeanContext.viewBean("content", group));- }-- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupTab.java b/core/src/main/java/io/onedev/server/web/page/group/GroupTab.javadeleted file mode 100644index b5a6a976f9..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupTab.java+++ /dev/null@@ -1,52 +0,0 @@-package io.onedev.server.web.page.group;--import org.apache.wicket.Component;-import org.apache.wicket.model.Model;--import io.onedev.server.web.component.tabbable.PageTab;--@SuppressWarnings("serial")-public class GroupTab extends PageTab {-- private final String iconClass;-- public GroupTab(String title, String iconClass, Class<? extends GroupPage> mainPageClass) {- super(Model.of(title), mainPageClass);-- this.iconClass = iconClass;- }-- public GroupTab(String title, String iconClass, Class<? extends GroupPage> mainPageClass,- Class<? extends GroupPage> additionalPageClass1) {- super(Model.of(title), mainPageClass, additionalPageClass1);-- this.iconClass = iconClass;- }-- public GroupTab(String title, String iconClass, Class<? extends GroupPage> mainPageClass,- Class<? extends GroupPage> additionalPageClass1,- Class<? extends GroupPage> additionalPageClass2) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);-- this.iconClass = iconClass;- }-- public GroupTab(String title, String iconClass, Class<? extends GroupPage> mainPageClass,- Class<? extends GroupPage> additionalPageClass1,- Class<? extends GroupPage> additionalPageClass2,- Class<? extends GroupPage> additionalPageClass3) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);-- this.iconClass = iconClass;- }-- public String getIconClass() {- return iconClass;- }-- @Override- public Component render(String componentId) {- return new GroupTabLink(componentId, this);- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupTabLink.html b/core/src/main/java/io/onedev/server/web/page/group/GroupTabLink.htmldeleted file mode 100644index f9086e7c60..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupTabLink.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label" class="text"></span></a>-</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupTabLink.java b/core/src/main/java/io/onedev/server/web/page/group/GroupTabLink.javadeleted file mode 100644index 9a23bd12bb..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/GroupTabLink.java+++ /dev/null@@ -1,34 +0,0 @@-package io.onedev.server.web.page.group;--import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Panel;--import io.onedev.server.web.component.link.ViewStateAwarePageLink;--@SuppressWarnings("serial")-public class GroupTabLink extends Panel {-- private final GroupTab tab;-- public GroupTabLink(String id, GroupTab tab) {- super(id);-- this.tab = tab;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- GroupPage page = (GroupPage) getPage();- Link<Void> link = new ViewStateAwarePageLink<Void>("link",- tab.getMainPageClass(), GroupPage.paramsOf(page.getGroup()));- link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));- link.add(new Label("label", tab.getTitleModel()));- add(link);- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/group/NewGroupPage.html b/core/src/main/java/io/onedev/server/web/page/group/NewGroupPage.htmldeleted file mode 100644index 7a9c13bf11..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/NewGroupPage.html+++ /dev/null@@ -1,22 +0,0 @@-<wicket:extend>- <div class="new-group">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="editor"></div>- <div class="checkbox">- <label>- <input wicket:id="administrator" type="checkbox"/> Is Administrator- <div class="help-block">Members of administrator group have administrative rights over the whole system</div>- </label>- </div>- <div class="checkbox">- <label>- <input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects- <div class="help-block">Check this to make members of this group able to fork/create projects</div>- </label>- </div>- <div class="actions clearfix">- <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input>- </div>- </form>- </div>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java b/core/src/main/java/io/onedev/server/web/page/group/NewGroupPage.javadeleted file mode 100644index 1b7c43e5ce..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java+++ /dev/null@@ -1,148 +0,0 @@-package io.onedev.server.web.page.group;--import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.CheckBox;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;--import com.google.common.collect.Sets;--import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.model.Group;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ComponentRenderer;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;-import io.onedev.server.web.page.layout.LayoutPage;--@SuppressWarnings("serial")-public class NewGroupPage extends LayoutPage {-- private Group group = new Group();-- private CheckBox administratorInput;-- private CheckBox canCreateProjectsInput;-- @Override- protected void onInitialize() {- super.onInitialize();-- BeanEditor editor = BeanContext.editBean("editor", group,- Sets.newHashSet("administrator", "canCreateProjects"), true);-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- GroupManager groupManager = OneDev.getInstance(GroupManager.class);- Group groupWithSameName = groupManager.find(group.getName());- if (groupWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))- .addError("This name has already been used by another group");- }- if (!editor.hasErrors(true)) {- group.setAdministrator(administratorInput.getModelObject());- group.setCanCreateProjects(canCreateProjectsInput.getModelObject());- groupManager.save(group, null);- Session.get().success("Group created");- setResponsePage(GroupMembershipsPage.class, GroupMembershipsPage.paramsOf(group));- }- }-- };- form.add(editor);- administratorInput = new CheckBox("administrator", Model.of(group.isAdministrator()));- administratorInput.add(new OnChangeAjaxBehavior() {-- @Override- protected void onUpdate(AjaxRequestTarget target) {- if (administratorInput.getModelObject())- canCreateProjectsInput.setModelObject(true);- target.add(canCreateProjectsInput);- }-- });- form.add(administratorInput);-- canCreateProjectsInput = new CheckBox("canCreateProjects", Model.of(group.isCanCreateProjects())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(!administratorInput.getModelObject());- }-- };- canCreateProjectsInput.setOutputMarkupId(true);- form.add(canCreateProjectsInput);- add(form);- }-- @Override- protected List<ComponentRenderer> getBreadcrumbs() {- List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new ViewStateAwarePageLink<Void>(componentId, GroupListPage.class) {-- @Override- public IModel<?> getBody() {- return Model.of("Groups");- }-- };- }-- });-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new Label(componentId, "New Group") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("div");- }-- };- }-- });-- return breadcrumbs;- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.isAdministrator();- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new GroupCssResourceReference()));- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/group/group.css b/core/src/main/java/io/onedev/server/web/page/group/group.cssdeleted file mode 100644index fbb0b973aa..0000000000--- a/core/src/main/java/io/onedev/server/web/page/group/group.css+++ /dev/null@@ -1,14 +0,0 @@-#group.sidebar>table>tbody>tr>td.nav>.tabs>li>a {- width: 220px;-}-#group.sidebar>table>tbody>tr>td.content {- padding: 20px;-}-#group .authorization.list .head .select2-container,-#group .membership.list .head .select2-container {- width: 240px;-}--.group.list .actions a {- color: #666;-}diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex c482095d40..0d13f3fc15 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -46,9 +46,6 @@<wicket:enclosure child="users"><li><a wicket:id="users">Users</a></li></wicket:enclosure>- <wicket:enclosure child="groups">- <li><a wicket:id="groups">Groups</a></li>- </wicket:enclosure><li wicket:id="extensions"><a wicket:id="link"><span wicket:id="label"></span></a></li><wicket:enclosure child="administration"><li><a wicket:id="administration">Administration</a></li>diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 08b97021c0..4db5477b55 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -40,7 +40,6 @@ import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;import io.onedev.server.web.page.base.BasePage;-import io.onedev.server.web.page.group.GroupListPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.page.security.LogoutPage;@@ -75,7 +74,6 @@ public abstract class LayoutPage extends BasePage {Fragment fragment = new Fragment(id, "navFrag", LayoutPage.this);fragment.add(new ViewStateAwarePageLink<Void>("projects", ProjectListPage.class));fragment.add(new ViewStateAwarePageLink<Void>("users", UserListPage.class).setVisible(SecurityUtils.isAdministrator()));- fragment.add(new ViewStateAwarePageLink<Void>("groups", GroupListPage.class).setVisible(SecurityUtils.isAdministrator()));fragment.add(new ListView<LayoutMenuContribution>("extensions", new LoadableDetachableModel<List<LayoutMenuContribution>>() {@@ -190,7 +188,7 @@ public abstract class LayoutPage extends BasePage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canAccessPublic();+ return getLoginUser() != null || OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess();}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.javaindex f66e83b27e..003216f630 100644--- a/core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java@@ -4,7 +4,9 @@ import org.apache.wicket.RestartResponseException;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;@SuppressWarnings("serial")public class NoCommitsPage extends ProjectPage {@@ -12,8 +14,12 @@ public class NoCommitsPage extends ProjectPage {public NoCommitsPage(PageParameters params) {super(params);- if (getProject().getDefaultBranch() != null)- throw new RestartResponseException(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject()));+ if (getProject().getDefaultBranch() != null) {+ if (SecurityUtils.canReadCode(getProject().getFacade()))+ throw new RestartResponseException(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject()));+ else+ throw new RestartResponseException(IssueListPage.class, ProjectBlobPage.paramsOf(getProject()));+ }}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.htmlindex 269a9347dd..4fe394f507 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html@@ -14,7 +14,7 @@<div class="body"><div wicket:id="orphanProjectsNote" class="alert alert-warning">Orphan projects are those without explicit administrators. For instance,project forked/created by some user will become orphan if that user account is deleted. You may delete orphan projects- to save resource or assign someone else as explicit project administrator if it is still useful.</div>+ to save resource or add someone else into a team with administrative rights if it is still useful.</div><div wicket:id="projects"></div></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex 046fcebbb8..329bbdca8b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -24,11 +24,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.manager.CacheManager;import io.onedev.server.manager.ProjectManager;-import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.facade.GroupAuthorizationFacade;+import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.util.facade.MembershipFacade;import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;+import io.onedev.server.util.facade.TeamFacade;import io.onedev.server.web.ComponentRenderer;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.link.ViewStateAwarePageLink;@@ -54,20 +54,19 @@ public class ProjectListPage extends LayoutPage {CacheManager cacheManager = OneDev.getInstance(CacheManager.class);List<ProjectFacade> projects = new ArrayList<>();+ Set<Long> teamIdsWithMembers = new HashSet<>();+ for (MembershipFacade membership: cacheManager.getMemberships().values())+ teamIdsWithMembers.add(membership.getTeamId());+Set<Long> projectIdsWithExplicitAdministrators = new HashSet<>();- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getPrivilege() == ProjectPrivilege.ADMIN)- projectIdsWithExplicitAdministrators.add(authorization.getProjectId());- }- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (authorization.getPrivilege() == ProjectPrivilege.ADMIN)- projectIdsWithExplicitAdministrators.add(authorization.getProjectId());+ for (TeamFacade team: cacheManager.getTeams().values()) {+ if (team.getPrivilege() == ProjectPrivilege.PROJECT_ADMINISTRATION && teamIdsWithMembers.contains(team.getId()))+ projectIdsWithExplicitAdministrators.add(team.getProjectId());}for (ProjectFacade project: cacheManager.getProjects().values()) {- if (!projectIdsWithExplicitAdministrators.contains(project.getId())) {+ if (!projectIdsWithExplicitAdministrators.contains(project.getId()))projects.add(project);- }}projects.sort(Comparator.comparing(ProjectFacade::getName));diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex f8d7fa8a29..d512782390 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -63,9 +63,10 @@ import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;import io.onedev.server.web.page.project.stats.ProjectStatsPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;+import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")-public abstract class ProjectPage extends LayoutPage {+public abstract class ProjectPage extends LayoutPage implements ProjectAware {private static final String PARAM_PROJECT = "project";@@ -112,6 +113,7 @@ public abstract class ProjectPage extends LayoutPage {projectModel.setObject(project);if (!(this instanceof NoCommitsPage)+ && SecurityUtils.canReadCode(getProject().getFacade())&& !(this instanceof ProjectSettingPage)&& getProject().getDefaultBranch() == null) {throw new RestartResponseException(NoCommitsPage.class, paramsOf(getProject()));@@ -138,42 +140,44 @@ public abstract class ProjectPage extends LayoutPage {@Overrideprotected List<? extends Tab> newTabs() {List<PageTab> tabs = new ArrayList<>();- tabs.add(new ProjectTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, ProjectBlobPage.class));- tabs.add(new ProjectTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,- ProjectCommitsPage.class, CommitDetailPage.class) {-- @Override- public Component render(String componentId) {- return new ProjectTabLink(componentId, this) {+ if (SecurityUtils.canReadCode(getProject().getFacade())) {+ tabs.add(new ProjectTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, ProjectBlobPage.class));+ tabs.add(new ProjectTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,+ ProjectCommitsPage.class, CommitDetailPage.class) {++ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this) {- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new FirstCommitQueryLink(linkId, getProject());- }- };- }+ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new FirstCommitQueryLink(linkId, getProject());+ }+ };+ }++ });+ tabs.add(new ProjectTab(Model.of("Branches"), "fa fa-fw fa-code-fork",+ 0, ProjectBranchesPage.class));+ tabs.add(new ProjectTab(Model.of("Tags"), "fa fa-fw fa-tag",+ 0, ProjectTagsPage.class));- });- tabs.add(new ProjectTab(Model.of("Branches"), "fa fa-fw fa-code-fork",- 0, ProjectBranchesPage.class));- tabs.add(new ProjectTab(Model.of("Tags"), "fa fa-fw fa-tag",- 0, ProjectTagsPage.class));-- tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",- 0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class, InvalidRequestPage.class) {-- @Override- public Component render(String componentId) {- return new ProjectTabLink(componentId, this) {+ tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",+ 0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class, InvalidRequestPage.class) {++ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this) {- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new FirstPullRequestQueryLink(linkId, getProject());- }- };- }-- });+ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new FirstPullRequestQueryLink(linkId, getProject());+ }+ };+ }++ });+ }tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, IssueListPage.class, IssuesPage.class,IssueDetailPage.class, NewIssuePage.class) {@@ -191,28 +195,30 @@ public abstract class ProjectPage extends LayoutPage {});- tabs.add(new ProjectTab(Model.of("Code Comments"), "fa fa-fw fa-comments",- 0, ProjectCodeCommentsPage.class) {+ if (SecurityUtils.canReadCode(getProject().getFacade())) {+ tabs.add(new ProjectTab(Model.of("Code Comments"), "fa fa-fw fa-comments",+ 0, ProjectCodeCommentsPage.class) {- @Override- public Component render(String componentId) {- return new ProjectTabLink(componentId, this) {+ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this) {- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new FirstCodeCommentQueryLink(linkId, getProject());- }- };- }+ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new FirstCodeCommentQueryLink(linkId, getProject());+ }+ };+ }++ });- });-- tabs.add(new ProjectTab(Model.of("Compare"), "fa fa-fw fa-ext fa-file-diff", 0, RevisionComparePage.class));-- tabs.add(new ProjectTab(Model.of("Statistics"), "fa fa-fw fa-bar-chart", 0, ProjectContribsPage.class,- ProjectStatsPage.class));+ tabs.add(new ProjectTab(Model.of("Compare"), "fa fa-fw fa-ext fa-file-diff", 0, RevisionComparePage.class));++ tabs.add(new ProjectTab(Model.of("Statistics"), "fa fa-fw fa-bar-chart", 0, ProjectContribsPage.class,+ ProjectStatsPage.class));+ }- if (SecurityUtils.canManage(getProject()))+ if (SecurityUtils.canAdministrate(getProject().getFacade()))tabs.add(new ProjectTab(Model.of("Setting"), "fa fa-fw fa-cog", 0, GeneralSettingPage.class, ProjectSettingPage.class));return tabs;@@ -229,9 +235,10 @@ public abstract class ProjectPage extends LayoutPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canRead(getProject());+ return SecurityUtils.canReadIssues(getProject().getFacade());}+ @Overridepublic Project getProject() {return projectModel.getObject();}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 98b081ac40..fc5d87f069 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -414,7 +414,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {Project project = getProject();if ((state.mode == Mode.VIEW || state.mode == Mode.BLAME)&& isOnBranch() && state.blobIdent.isTree()- && SecurityUtils.canWrite(project)) {+ && SecurityUtils.canWriteCode(project.getFacade())) {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);setEnabled(!projectManager.isModificationNeedsQualityCheck(getLoginUser(), project, state.blobIdent.revision, null));@@ -1188,4 +1188,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.javaindex 485e25a37b..cf4401240b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java@@ -49,7 +49,7 @@ class LastCommitsResource extends AbstractResource {@Overrideprotected ResourceResponse newResourceResponse(Attributes attributes) {PageParameters params = attributes.getParameters();- final Long repoId = params.get(PARAM_REPO).toLong();+ final Long projectId = params.get(PARAM_REPO).toLong();final String revision = params.get(PARAM_REVISION).toString();final String path = params.get(PARAM_PATH).toOptionalString();@@ -59,12 +59,12 @@ class LastCommitsResource extends AbstractResource {@Overridepublic void writeData(Attributes attributes) throws IOException {- Project repo = OneDev.getInstance(Dao.class).load(Project.class, repoId);+ Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);- if (!SecurityUtils.canRead(repo))+ if (!SecurityUtils.canReadCode(project.getFacade()))throw new UnauthorizedException();- LastCommitsOfChildren lastCommits = repo.getLastCommitsOfChildren(revision, path);+ LastCommitsOfChildren lastCommits = project.getLastCommitsOfChildren(revision, path);UserManager userManager = OneDev.getInstance(UserManager.class);AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);@@ -74,7 +74,7 @@ class LastCommitsResource extends AbstractResource {LastCommitInfo info = new LastCommitInfo();LastCommitsOfChildren.Value value = entry.getValue();- PageParameters params = CommitDetailPage.paramsOf(repo, value.getId().name());+ PageParameters params = CommitDetailPage.paramsOf(project, value.getId().name());info.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();info.summary = StringEscapeUtils.escapeHtml4(value.getSummary());info.when = DateUtils.formatAge(value.getCommitDate());diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex 74f53028be..a1281cb451 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -72,7 +72,7 @@ public abstract class BlobViewPanel extends Panel {WebMarkupContainer changeActions = new WebMarkupContainer("changeActions");Project project = context.getProject();- if (SecurityUtils.canWrite(project) && context.isOnBranch()) {+ if (SecurityUtils.canWriteCode(project.getFacade()) && context.isOnBranch()) {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);User user = OneDev.getInstance(UserManager.class).getCurrent();boolean needsQualityCheck = projectManager.isModificationNeedsQualityCheck(diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex d051bbd74c..57aaebf076 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -466,7 +466,7 @@ public class ProjectBranchesPage extends ProjectPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject())+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade())&& !branch.equals(getProject().getDefaultBranch()));}@@ -676,7 +676,7 @@ public class ProjectBranchesPage extends ProjectPage {super.onConfigure();Project project = getProject();- if (SecurityUtils.canWrite(project)) {+ if (SecurityUtils.canWriteCode(project.getFacade())) {if (project.getDefaultBranch().equals(branch)) {setEnabled(false);} else {@@ -787,4 +787,9 @@ public class ProjectBranchesPage extends ProjectPage {target.add(pagingNavigator);}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.javaindex 12b21523d4..df9e6fc66e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java@@ -20,6 +20,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.codecomment.CodeCommentListPanel;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.project.ProjectPage;@@ -189,6 +190,11 @@ public class ProjectCodeCommentsPage extends ProjectPage {});}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+public static PageParameters paramsOf(Project project, @Nullable String query) {PageParameters params = paramsOf(project);if (query != null)diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex dc22548afb..44a4654b48 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -50,6 +50,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.MarkPos;import io.onedev.server.search.code.CommitIndexed;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.avatar.ContributorAvatars;@@ -564,4 +565,9 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {return observables;}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex 157bdc3fb2..ff770b2f87 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -721,6 +721,10 @@ public class ProjectCommitsPage extends ProjectPage {List<RevCommit> current;}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }@Nullableprivate QueryContext getQueryContext() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex fe1d2be011..5dbcb6cf00 100644--- a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -41,6 +41,7 @@ import io.onedev.server.model.support.MarkPos;import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.ProjectAndRevision;import io.onedev.server.search.code.CommitIndexed;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.TooltipBehavior;import io.onedev.server.web.component.commitlist.CommitListPanel;@@ -651,6 +652,11 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {super.onDetach();}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+public static class State implements Serializable {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.javaindex 0268394fa3..24b1813389 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java@@ -45,7 +45,7 @@ public abstract class IssuesPage extends ProjectPage {protected void onInitialize() {super.onInitialize();- if (SecurityUtils.canManage(getProject())) {+ if (SecurityUtils.canAdministrate(getProject().getFacade())) {add(new ModalLink("reconcile") {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.javaindex b4a2ba1b09..8f6ab255d6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java@@ -124,7 +124,7 @@ abstract class BacklogColumnPanel extends Panel {protected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();Issue issue = OneDev.getInstance(IssueManager.class).load(params.getParameterValue("issue").toLong());- if (!SecurityUtils.canModify(issue))+ if (!SecurityUtils.canAdministrate(issue.getProject().getFacade()))throw new UnauthorizedException("Permission denied");OneDev.getInstance(IssueActionManager.class).changeMilestone(issue, null);if (getQuery().matches(issue, SecurityUtils.getUser())) {@@ -169,7 +169,7 @@ abstract class BacklogColumnPanel extends Panel {if (getQuery() != null && event.getPayload() instanceof IssueDragging) {IssueDragging issueDragging = (IssueDragging) event.getPayload();Issue issue = issueDragging.getIssue();- if (SecurityUtils.canModify(issue)) {+ if (SecurityUtils.canAdministrate(issue.getProject().getFacade())) {issue = SerializationUtils.clone(issue);issue.setMilestone(null);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.javaindex 7bd7a9d478..563608fcea 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java@@ -140,11 +140,11 @@ abstract class BoardColumnPanel extends Panel implements EditContext {break;}}- } else if (SecurityUtils.canModify(issue)) {+ } else if (SecurityUtils.canAdministrate(issue.getProject().getFacade())) {issue = SerializationUtils.clone(issue);issue.setFieldValue(identifyField, getColumn());}- } else if (SecurityUtils.canModify(issue)) {+ } else if (SecurityUtils.canAdministrate(issue.getProject().getFacade())) {// move issue between backlog column and board columnissue = SerializationUtils.clone(issue);issue.setMilestone(getMilestone());@@ -326,7 +326,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {String fieldName = getBoard().getIdentifyField();if (issue.getMilestone() == null && getMilestone() != null) {// move a backlog issue to board- if (!SecurityUtils.canModify(issue))+ if (!SecurityUtils.canAdministrate(issue.getProject().getFacade()))throw new UnauthorizedException("Permission denied");OneDev.getInstance(IssueActionManager.class).changeMilestone(issue, getMilestone());@@ -388,7 +388,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {checkMatched(target, issue);}} else {- if (!SecurityUtils.canModify(issue))+ if (!SecurityUtils.canAdministrate(issue.getProject().getFacade()))throw new UnauthorizedException("Permission denied");Map<String, Object> fieldValues = new HashMap<>();diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.javaindex bfe5bcf8f2..1afedeb59f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPage.java@@ -83,7 +83,7 @@ public class BoardEditPage extends IssuesPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canManage(getProject());+ return SecurityUtils.canAdministrate(getProject().getFacade());}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.javaindex c723b66d5c..64687ff3ab 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java@@ -146,7 +146,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {});ContentVersionSupport contentVersionSupport;- if (SecurityUtils.canModify(getIssue())) {+ if (SecurityUtils.canAdministrate(getIssue().getProject().getFacade())) {contentVersionSupport = new ContentVersionSupport() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.javaindex c5770631d5..bdb7d55f73 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java@@ -241,7 +241,7 @@ public class IssueBoardsPage extends IssuesPage {Fragment fragment = new Fragment("content", "hasBoardsFrag", this);Form<?> form = new Form<Void>("query");- if (!SecurityUtils.canManage(getProject()))+ if (!SecurityUtils.canAdministrate(getProject().getFacade()))form.add(AttributeAppender.append("style", "margin-right: 0;"));form.add(new DropdownLink("boardMenu") {@@ -260,7 +260,7 @@ public class IssueBoardsPage extends IssuesPage {@Overrideprotected void populateItem(ListItem<IssueBoard> item) {- item.add(new WebMarkupContainer("dragHandle").setVisible(SecurityUtils.canManage(getProject())));+ item.add(new WebMarkupContainer("dragHandle").setVisible(SecurityUtils.canAdministrate(getProject().getFacade())));PageParameters params = IssueBoardsPage.paramsOf(getProject(), item.getModelObject(), getMilestone(),@@ -275,7 +275,7 @@ public class IssueBoardsPage extends IssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));}});@@ -298,7 +298,7 @@ public class IssueBoardsPage extends IssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));}}.add(new ConfirmOnClick("Do you really want to delete board '" + item.getModelObject().getName() + "'?") ));@@ -471,7 +471,7 @@ public class IssueBoardsPage extends IssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));}});@@ -536,7 +536,7 @@ public class IssueBoardsPage extends IssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.javaindex 1d0bffba6c..73224dcadc 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPage.java@@ -66,7 +66,7 @@ public class NewBoardPage extends IssuesPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canManage(getProject());+ return SecurityUtils.canAdministrate(getProject().getFacade());}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 1df7a20a39..631db1caba 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -356,15 +356,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexelsequery = null;- add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject(), query)) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canRead(getProject()));- }-- });+ add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject(), query)));newEmptyActionOptions(null);@@ -479,7 +471,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex};deleteLink.add(new ConfirmOnClick("Do you really want to delete this issue?"));- deleteLink.setVisible(SecurityUtils.canModify(getIssue()));+ deleteLink.setVisible(SecurityUtils.canAdministrate(getIssue().getProject().getFacade()));add(deleteLink);}@@ -589,7 +581,10 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canModify(getIssue()));+ User user = getLoginUser();+ String initialState = getProject().getIssueWorkflow().getInitialStateSpec().getName();+ setVisible(SecurityUtils.canWriteCode(getIssue().getProject().getFacade())+ || user != null && user.equals(getIssue().getSubmitter()) && getIssue().getState().equals(initialState));}});@@ -681,7 +676,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canModify(getIssue()));+ setVisible(SecurityUtils.canWriteCode(getIssue().getProject().getFacade()));}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.javaindex 4da30857b9..17a32b15d5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java@@ -61,8 +61,8 @@ public class IssueActivitiesPage extends IssueDetailPage {for (IssueComment comment: getIssue().getComments())activities.add(new CommentedActivity(comment));- for (IssueAction change: getIssue().getChanges())- activities.add(new ActionActivity(change));+ for (IssueAction action: getIssue().getActions())+ activities.add(new ActionActivity(action));activities.sort((o1, o2) -> {if (o1.getDate().getTime()<o2.getDate().getTime())diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.javaindex fed0576696..5b40855a1e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.java@@ -62,8 +62,8 @@ public abstract class ActionDataPanel extends Panel {}@Override- protected boolean canManageComment() {- return SecurityUtils.canModify(getAction());+ protected boolean canModifyOrDeleteComment() {+ return SecurityUtils.canModifyOrDelete(getAction());}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.javaindex 84967ae2e6..9e4260e4dd 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java@@ -61,8 +61,8 @@ class CommentedPanel extends GenericPanel<IssueComment> {}@Override- protected boolean canManageComment() {- return SecurityUtils.canModify(CommentedPanel.this.getComment().getIssue());+ protected boolean canModifyOrDeleteComment() {+ return SecurityUtils.canModifyOrDelete(CommentedPanel.this.getComment());}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.javaindex b2497559a1..690b76642f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.java@@ -58,7 +58,7 @@ class OpenedPanel extends GenericPanel<Issue> {}@Override- protected boolean canManageComment() {+ protected boolean canModifyOrDeleteComment() {return SecurityUtils.canModify(getIssue());}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex 836401f0dc..38aed060d6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -86,7 +86,7 @@ public class MilestoneDetailPage extends IssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.javaindex 1869a47233..7502699bea 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java@@ -90,7 +90,7 @@ public class MilestoneEditPage extends IssuesPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canManage(getProject());+ return SecurityUtils.canAdministrate(getProject().getFacade());}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.javaindex 719fe9e01d..23661c1b96 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java@@ -140,7 +140,7 @@ public class MilestoneListPage extends IssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));}});@@ -185,7 +185,7 @@ public class MilestoneListPage extends IssuesPage {}});- if (SecurityUtils.canManage(getProject())) {+ if (SecurityUtils.canAdministrate(getProject().getFacade())) {columns.add(new AbstractColumn<Milestone, Void>(Model.of("Actions")) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.javaindex 34bcf2e63c..84040800cb 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java@@ -69,7 +69,7 @@ public class NewMilestonePage extends IssuesPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canManage(getProject());+ return SecurityUtils.canAdministrate(getProject().getFacade());}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.javaindex ff5fbacedf..4f5a65bf45 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.java@@ -58,7 +58,7 @@ public class InvalidRequestPage extends ProjectPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canModify(requestModel.getObject()));+ setVisible(SecurityUtils.canAdministrate(requestModel.getObject().getTargetProject().getFacade()));}}.add(new ConfirmOnClick("Do you really want to delete pull request #" + requestModel.getObject().getNumber() + "?")));@@ -76,6 +76,11 @@ public class InvalidRequestPage extends ProjectPage {super.onDetach();}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.javaindex be181b227c..9ff1b59fc4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java@@ -801,6 +801,11 @@ public class NewRequestPage extends ProjectPage implements CommentSupport {}}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+@Overridepublic String getCommentUrl(CodeComment comment) {RevisionComparePage.State state = new RevisionComparePage.State();diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/PullRequestOperation.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/PullRequestOperation.javaindex 256d40f14e..0e4f6b5522 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/PullRequestOperation.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/PullRequestOperation.java@@ -129,7 +129,7 @@ public enum PullRequestOperation {return request.getSourceProject() != null&& request.getSource().getObjectName(false) == null&& SecurityUtils.canModify(request)- && SecurityUtils.canWrite(request.getSourceProject());+ && SecurityUtils.canWriteCode(request.getSourceProject().getFacade());}};diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.javaindex bf4c0a344c..88a0a8e48c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java@@ -470,7 +470,7 @@ public abstract class RequestDetailPage extends ProjectPage {private WebMarkupContainer newManageContainer() {WebMarkupContainer container = new WebMarkupContainer("manage");- container.setVisible(SecurityUtils.canModify(getPullRequest()));+ container.setVisible(SecurityUtils.canAdministrate(getPullRequest().getTargetProject().getFacade()));container.add(new Link<Void>("synchronize") {@Override@@ -1107,6 +1107,11 @@ public abstract class RequestDetailPage extends ProjectPage {response.render(JavaScriptHeaderItem.forReference(new RequestDetailResourceReference()));}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+private class RequestTab extends PageTab {public RequestTab(String title, Class<? extends Page> pageClass) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionDataPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionDataPanel.javaindex e3752f2e82..9074314b31 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionDataPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionDataPanel.java@@ -68,8 +68,8 @@ public abstract class ActionDataPanel extends Panel {}@Override- protected boolean canManageComment() {- return SecurityUtils.canModify(getAction());+ protected boolean canModifyOrDeleteComment() {+ return SecurityUtils.canModifyOrDelete(getAction());}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/CommentedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/CommentedPanel.javaindex 127c282857..da22c80830 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/CommentedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/CommentedPanel.java@@ -73,8 +73,8 @@ class CommentedPanel extends GenericPanel<PullRequestComment> {}@Override- protected boolean canManageComment() {- return SecurityUtils.canModify(CommentedPanel.this.getComment().getRequest());+ protected boolean canModifyOrDeleteComment() {+ return SecurityUtils.canModifyOrDelete(CommentedPanel.this.getComment());}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/OpenedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/OpenedPanel.javaindex 3eb4df760f..488bdf0b1a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/OpenedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/OpenedPanel.java@@ -58,7 +58,7 @@ class OpenedPanel extends GenericPanel<PullRequest> {}@Override- protected boolean canManageComment() {+ protected boolean canModifyOrDeleteComment() {return SecurityUtils.canModify(getPullRequest());}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.javaindex ff82021053..5747662960 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java@@ -286,7 +286,7 @@ public class RequestListPage extends ProjectPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canRead(getProject()));+ setVisible(SecurityUtils.canReadCode(getProject().getFacade()));}});@@ -478,6 +478,11 @@ public class RequestListPage extends ProjectPage {response.render(CssHeaderItem.forReference(new RequestListResourceReference()));}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+public static PageParameters paramsOf(Project project, @Nullable String query) {PageParameters params = paramsOf(project);if (query != null)diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.javaindex 0116e746c3..e556722645 100644--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java@@ -61,7 +61,7 @@ public abstract class SaveQueryPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.javaindex 3b548c453a..901036291f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java@@ -148,7 +148,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- if (SecurityUtils.canManage(getProject())) {+ if (SecurityUtils.canAdministrate(getProject().getFacade())) {setVisible(!getUserQueries().isEmpty() || !getProjectQueries().isEmpty());} else {setVisible(SecurityUtils.getUser() != null && !getUserQueries().isEmpty());@@ -220,7 +220,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {}ArrayList<T> projectQueries = getProjectQueries();- if (SecurityUtils.canManage(getProject()) && !projectQueries.isEmpty()) {+ if (SecurityUtils.canAdministrate(getProject().getFacade()) && !projectQueries.isEmpty()) {tabs.add(new AjaxActionTab(Model.of("For All Users")) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.javaindex c48560b9f6..a89d474290 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java@@ -13,7 +13,6 @@ import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;import io.onedev.server.web.page.project.setting.configuration.ConfigurationEditPage;@@ -24,6 +23,9 @@ import io.onedev.server.web.page.project.setting.issueworkflow.fields.IssueFieldimport io.onedev.server.web.page.project.setting.issueworkflow.states.IssueStatesPage;import io.onedev.server.web.page.project.setting.issueworkflow.statetransitions.StateTransitionsPage;import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;+import io.onedev.server.web.page.project.setting.team.NewTeamPage;+import io.onedev.server.web.page.project.setting.team.TeamEditPage;+import io.onedev.server.web.page.project.setting.team.TeamListPage;@SuppressWarnings("serial")public abstract class ProjectSettingPage extends ProjectPage {@@ -34,7 +36,7 @@ public abstract class ProjectSettingPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canManage(getProject());+ return SecurityUtils.canAdministrate(getProject().getFacade());}@Override@@ -47,7 +49,7 @@ public abstract class ProjectSettingPage extends ProjectPage {protected List<? extends Tab> newTabs() {List<PageTab> tabs = new ArrayList<>();tabs.add(new ProjectSettingTab("General Setting", "fa fa-fw fa-sliders", GeneralSettingPage.class));- tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.class));+ tabs.add(new ProjectSettingTab("Teams", "fa fa-fw fa-group", TeamListPage.class, NewTeamPage.class, TeamEditPage.class));tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-comments", CommitMessageTransformPage.class));diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.htmldeleted file mode 100644index d307a6aecc..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html+++ /dev/null@@ -1,24 +0,0 @@-<wicket:extend>- <div class="authorization list">- <div class="head clearfix">- <div class="pull-left">- <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by user name"></input>- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>- </div>- <div class="pull-left">- <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>- </div>- </div>- <table wicket:id="authorizations" class="authorizations table table-hover table-condensed"></table>- </div>- <wicket:fragment wicket:id="userFrag">- <a wicket:id="avatarLink"></a>- <a wicket:id="nameLink"></a>- </wicket:fragment>- <wicket:fragment wicket:id="privilegeFrag">- <a wicket:id="dropdown" class="btn btn-xs btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="otherSources" class="other-sources" title="This permission is granted from other sources, click for details"><i class="fa fa-warning"></i></a>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javadeleted file mode 100644index c9a60eabf6..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java+++ /dev/null@@ -1,502 +0,0 @@-package io.onedev.server.web.page.project.setting.authorization;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;-import java.util.HashMap;-import java.util.HashSet;-import java.util.Iterator;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import java.util.Set;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-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.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.UserAuthorizationManager;-import io.onedev.server.manager.UserManager;-import io.onedev.server.model.User;-import io.onedev.server.model.UserAuthorization;-import io.onedev.server.security.ProjectPrivilege;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.avatar.AvatarLink;-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;-import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.link.UserLink;-import io.onedev.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel;-import io.onedev.server.web.component.projectprivilege.privilegesource.PrivilegeSourcePanel;-import io.onedev.server.web.component.select2.Response;-import io.onedev.server.web.component.select2.ResponseFiller;-import io.onedev.server.web.component.select2.SelectToAddChoice;-import io.onedev.server.web.component.userchoice.AbstractUserChoiceProvider;-import io.onedev.server.web.component.userchoice.UserChoiceResourceReference;-import io.onedev.server.web.page.project.setting.ProjectSettingPage;-import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.utils.matchscore.MatchScoreProvider;-import io.onedev.utils.matchscore.MatchScoreUtils;--@SuppressWarnings("serial")-public class ProjectAuthorizationsPage extends ProjectSettingPage {-- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private String searchInput;-- private DataTable<Long, Void> authorizationsTable;-- private SelectionColumn<Long, Void> selectionColumn;-- private IModel<Map<Long, UserAuthorizationFacade>> explicitUserAuthorizationsModel =- new LoadableDetachableModel<Map<Long, UserAuthorizationFacade>>() {-- @Override- protected Map<Long, UserAuthorizationFacade> load() {- Map<Long, UserAuthorizationFacade> authorizations = new HashMap<>();- for (UserAuthorizationFacade authorization:- OneDev.getInstance(CacheManager.class).getUserAuthorizations().values()) {- if (authorization.getProjectId().equals(getProject().getId()))- authorizations.put(authorization.getUserId(), authorization);- }- return authorizations;- }-- };-- private IModel<Map<Long, ProjectPrivilege>> userAuthorizationsModel =- new LoadableDetachableModel<Map<Long, ProjectPrivilege>>() {-- @Override- protected Map<Long, ProjectPrivilege> load() {- Map<Long, ProjectPrivilege> userAuthorizations = new HashMap<>();- Collection<Long> usersAuthorizedFromOtherSources = new HashSet<>();- userAuthorizations.put(User.ROOT_ID, ProjectPrivilege.ADMIN);- usersAuthorizedFromOtherSources.add(User.ROOT_ID);-- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- Set<Long> adminGroupIds = new HashSet<>();- for (GroupFacade group: cacheManager.getGroups().values()) {- if (group.isAdministrator())- adminGroupIds.add(group.getId());- }- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (adminGroupIds.contains(membership.getGroupId())) {- userAuthorizations.put(membership.getUserId(), ProjectPrivilege.ADMIN);- usersAuthorizedFromOtherSources.add(membership.getUserId());- }- }-- Map<Long, ProjectPrivilege> groupAuthorizations = new HashMap<>();- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (authorization.getProjectId().equals(getProject().getId()))- groupAuthorizations.put(authorization.getGroupId(), authorization.getPrivilege());- }- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- ProjectPrivilege groupPrivilege = groupAuthorizations.get(membership.getGroupId());- if (groupPrivilege != null) {- ProjectPrivilege userPrivilege = userAuthorizations.get(membership.getUserId());- if (userPrivilege == null || groupPrivilege.implies(userPrivilege))- userAuthorizations.put(membership.getUserId(), groupPrivilege);- usersAuthorizedFromOtherSources.add(membership.getUserId());- }- }- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getProjectId().equals(getProject().getId())) {- ProjectPrivilege userPrivilege = userAuthorizations.get(authorization.getUserId());- if (userPrivilege == null || authorization.getPrivilege().implies(userPrivilege))- userAuthorizations.put(authorization.getUserId(), authorization.getPrivilege());- }- }- if (getProject().isPublicRead()) {- for (UserFacade user: cacheManager.getUsers().values()) {- ProjectPrivilege userPrivilege = userAuthorizations.get(user.getId());- if (userPrivilege == null || ProjectPrivilege.READ.implies(userPrivilege))- userAuthorizations.put(user.getId(), ProjectPrivilege.READ);- usersAuthorizedFromOtherSources.add(user.getId());- }- }-- Map<Long, UserAuthorizationFacade> explicitUserAuthorizations = getExplicitUserAuthorizations();- List<Long> userIds = new ArrayList<>(userAuthorizations.keySet());- Collections.sort(userIds, new Comparator<Long>() {-- @Override- public int compare(Long o1, Long o2) {- if (usersAuthorizedFromOtherSources.contains(o1)) {- if (usersAuthorizedFromOtherSources.contains(o2)) {- return o1.compareTo(o2);- } else {- return 1;- }- } else {- if (usersAuthorizedFromOtherSources.contains(o2)) {- return -1;- } else {- return explicitUserAuthorizations.get(o2).getId()- .compareTo(explicitUserAuthorizations.get(o1).getId());- }- }- }-- });-- Map<Long, ProjectPrivilege> sortedUserAuthorizations = new LinkedHashMap<>();- for (Long userId: userIds) {- sortedUserAuthorizations.put(userId, userAuthorizations.get(userId));- }-- return sortedUserAuthorizations;- }-- };-- public ProjectAuthorizationsPage(PageParameters params) {- super(params);- }-- @Override- protected void onDetach() {- explicitUserAuthorizationsModel.detach();- userAuthorizationsModel.detach();- super.onDetach();- }-- private Map<Long, ProjectPrivilege> getUserAuthorizations() {- return userAuthorizationsModel.getObject();- }-- private Map<Long, UserAuthorizationFacade> getExplicitUserAuthorizations() {- return explicitUserAuthorizationsModel.getObject();- }-- private boolean isPrivilegeFromOtherSources(Long userId) {- UserAuthorizationFacade authorization = getExplicitUserAuthorizations().get(userId);- ProjectPrivilege privilege = getUserAuthorizations().get(userId);- return authorization == null || !authorization.getPrivilege().implies(privilege);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("filterUsers", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(authorizationsTable);- }-- });-- add(new SelectToAddChoice<UserFacade>("addNew", new AbstractUserChoiceProvider() {-- @Override- public void query(String term, int page, Response<UserFacade> response) {- List<UserFacade> notAuthorized = new ArrayList<>();-- for (UserFacade user: OneDev.getInstance(CacheManager.class).getUsers().values()) {- if (!getUserAuthorizations().containsKey(user.getId()))- notAuthorized.add(user);- }- Collections.sort(notAuthorized);- Collections.reverse(notAuthorized);-- notAuthorized = MatchScoreUtils.filterAndSort(notAuthorized, new MatchScoreProvider<UserFacade>() {-- @Override- public double getMatchScore(UserFacade object) {- return object.getMatchScore(term);- }-- });- new ResponseFiller<UserFacade>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add user...");- getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult");- getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, UserFacade selection) {- UserAuthorization authorization = new UserAuthorization();- authorization.setProject(getProject());- authorization.setUser(OneDev.getInstance(UserManager.class).load(selection.getId()));- OneDev.getInstance(UserAuthorizationManager.class).save(authorization);- target.add(authorizationsTable);- Session.get().success("User added");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));- }-- });-- AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<UserAuthorization> authorizationsToDelete = new HashSet<>();- Map<Long, UserAuthorizationFacade> explicitUserAuthorizations = getExplicitUserAuthorizations();- UserAuthorizationManager userAuthorizationManager = OneDev.getInstance(UserAuthorizationManager.class);- for (IModel<Long> model: selectionColumn.getSelections()) {- UserAuthorizationFacade authorization = explicitUserAuthorizations.get(model.getObject());- if (authorization != null) {- authorizationsToDelete.add(userAuthorizationManager.load(authorization.getId()));- explicitUserAuthorizations.remove(model.getObject());- }- }- userAuthorizationManager.delete(authorizationsToDelete);- target.add(authorizationsTable);- selectionColumn.getSelections().clear();- target.add(this);- }-- @Override- protected void onConfigure() {- super.onConfigure();-- boolean hasLocalPrivileges = false;- for (IModel<Long> model: selectionColumn.getSelections()) {- Long userId = model.getObject();- if (!isPrivilegeFromOtherSources(userId)) {- hasLocalPrivileges = true;- break;- }- }- setVisible(hasLocalPrivileges);- }-- };- deleteSelected.setOutputMarkupPlaceholderTag(true);- add(deleteSelected);-- List<IColumn<Long, Void>> columns = new ArrayList<>();-- selectionColumn = new SelectionColumn<Long, Void>() {-- @Override- protected void onSelectionChange(AjaxRequestTarget target) {- target.add(deleteSelected);- }-- };- columns.add(selectionColumn);-- columns.add(new AbstractColumn<Long, Void>(Model.of("User")) {-- @Override- public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId, IModel<Long> rowModel) {- Fragment fragment = new Fragment(componentId, "userFrag", ProjectAuthorizationsPage.this);- User user = OneDev.getInstance(UserManager.class).load(rowModel.getObject());- fragment.add(new AvatarLink("avatarLink", user));- fragment.add(new UserLink("nameLink", user));- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<Long, Void>(Model.of("Permission")) {-- @Override- public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId, IModel<Long> rowModel) {- Fragment fragment = new Fragment(componentId, "privilegeFrag", ProjectAuthorizationsPage.this) {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- Long userId = rowModel.getObject();- boolean canNotDelete = isPrivilegeFromOtherSources(userId)- || userId.equals(SecurityUtils.getUser().getId());- String script = String.format(""- + "$('#%s').closest('tr').find('.row-selector input').prop('disabled', %b);",- getMarkupId(), canNotDelete);-- response.render(OnDomReadyHeaderItem.forScript(script));- }-- };- WebMarkupContainer dropdown = new DropdownLink("dropdown") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- ProjectPrivilege privilege = getUserAuthorizations().get(rowModel.getObject());- return new PrivilegeSelectionPanel(id, privilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {- dropdown.close();- Long userId = rowModel.getObject();-- Map<Long, UserAuthorizationFacade> explicitUserAuthorizations =- getExplicitUserAuthorizations();- UserAuthorizationFacade userAuthorizationFacade =- explicitUserAuthorizations.get(userId);- UserAuthorizationManager userAuthorizationManager =- OneDev.getInstance(UserAuthorizationManager.class);- UserAuthorization userAuthorization;- if (userAuthorizationFacade == null) {- userAuthorization = new UserAuthorization();- userAuthorization.setProject(getProject());- userAuthorization.setUser(OneDev.getInstance(UserManager.class).load(userId));- } else {- userAuthorization = userAuthorizationManager.load(userAuthorizationFacade.getId());- }- userAuthorization.setPrivilege(privilege);- userAuthorizationManager.save(userAuthorization);- explicitUserAuthorizations.put(userId, userAuthorization.getFacade());-- target.add(fragment);-- if (getUserAuthorizations().get(userId) != privilege) {- Session.get().warn("Specified permission is not taking effect as a higher "- + "permission is granted from other sources");- }- }-- };- }-- };- dropdown.add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return getUserAuthorizations().get(rowModel.getObject()).name();- }-- }));-- Long userId = rowModel.getObject();- if (userId.equals(SecurityUtils.getUser().getId()) && !isPrivilegeFromOtherSources(userId)) {- dropdown.add(AttributeAppender.append("disabled", "true"));- dropdown.setEnabled(false);- }- fragment.add(dropdown);-- fragment.add(new DropdownLink("otherSources") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(isPrivilegeFromOtherSources(rowModel.getObject()));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Long userId = rowModel.getObject();- User user = OneDev.getInstance(UserManager.class).load(userId);- return new PrivilegeSourcePanel(id, user, getProject(), getUserAuthorizations().get(userId));- }-- });-- fragment.setOutputMarkupId(true);- cellItem.add(fragment);- }- });-- SortableDataProvider<Long, Void> dataProvider = new SortableDataProvider<Long, Void>() {-- private List<Long> getUserIds() {- List<Long> userIds = new ArrayList<>(getUserAuthorizations().keySet());- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- return MatchScoreUtils.filterAndSort(userIds, new MatchScoreProvider<Long>() {-- @Override- public double getMatchScore(Long object) {- return cacheManager.getUser(object).getMatchScore(searchInput);- }-- });- }-- @Override- public Iterator<? extends Long> iterator(long first, long count) {- List<Long> userIds = getUserIds();- if (first + count <= userIds.size())- return userIds.subList((int)first, (int)(first+count)).iterator();- else- return userIds.subList((int)first, userIds.size()).iterator();- }-- @Override- public long size() {- return getUserIds().size();- }-- @Override- public IModel<Long> model(Long object) {- return Model.of(object);- }- };-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getProject());- params.add(PARAM_CURRENT_PAGE, currentPage+1);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;- }-- };-- add(authorizationsTable = new HistoryAwareDataTable<Long, Void>("authorizations", columns,- dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport));- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.htmlindex a3f8725bcf..97e690706e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.html@@ -3,6 +3,7 @@<div wicket:id="editor"></div><div class="actions clearfix"><input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input>+ <a wicket:id="delete" class="delete btn btn-danger pull-right">Delete</a></div></form></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.javaindex 1f4e6a8fb5..220636f441 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java@@ -4,6 +4,7 @@ import org.apache.wicket.Session;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;@@ -13,6 +14,7 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.page.project.setting.ProjectSettingPage;+import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")public class ConfigurationEditPage extends ProjectSettingPage {@@ -30,8 +32,12 @@ public class ConfigurationEditPage extends ProjectSettingPage {oldName = getConfiguration().getName();}+ private ConfigurationManager getConfigurationManager() {+ return OneDev.getInstance(ConfigurationManager.class);+ }+private Configuration getConfiguration() {- return OneDev.getInstance(ConfigurationManager.class).load(configurationId);+ return getConfigurationManager().load(configurationId);}@Override@@ -47,8 +53,7 @@ public class ConfigurationEditPage extends ProjectSettingPage {protected void onSubmit() {super.onSubmit();- ConfigurationManager configurationManager = OneDev.getInstance(ConfigurationManager.class);- Configuration configurationWithSameName = configurationManager.find(getProject(), configuration.getName());+ Configuration configurationWithSameName = getConfigurationManager().find(getProject(), configuration.getName());if (configurationWithSameName != null && !configurationWithSameName.equals(configuration)) {editor.getErrorContext(new PathSegment.Property("name")).addError("This name has already been used by another configuration in the project");@@ -56,7 +61,7 @@ public class ConfigurationEditPage extends ProjectSettingPage {if (!editor.hasErrors(true)) {Configuration reloaded = getConfiguration();editor.getBeanDescriptor().copyProperties(configuration, reloaded);- configurationManager.save(reloaded, oldName);+ getConfigurationManager().save(reloaded, oldName);setResponsePage(ConfigurationListPage.class, ConfigurationListPage.paramsOf(getProject()));Session.get().success("Configuration updated");}@@ -64,6 +69,17 @@ public class ConfigurationEditPage extends ProjectSettingPage {};form.add(editor);++ form.add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ getConfigurationManager().delete(getConfiguration());+ setResponsePage(ConfigurationListPage.class, ConfigurationListPage.paramsOf(getProject()));+ }++ }.add(new ConfirmOnClick("Do you really want to delete this configuration?")));+add(form);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.htmlindex 3679be328e..626c26b679 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html@@ -12,8 +12,10 @@<table wicket:id="configurations" class="configurations table table-hover"></table></div></div>+ <wicket:fragment wicket:id="nameFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment><wicket:fragment wicket:id="actionFrag">- <a wicket:id="edit" title="Edit this configuration"><i class="fa fa-pencil"></i></a><a wicket:id="delete" title="Delete this configuration"><i class="fa fa-trash"></i></a></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.javaindex 230fe87d0a..40e1f19bb8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java@@ -15,6 +15,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;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.Fragment;import org.apache.wicket.markup.repeater.Item;@@ -101,8 +102,15 @@ public class ConfigurationListPage extends ProjectSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<Configuration>> cellItem, String componentId,IModel<Configuration> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getName()));+ Fragment fragment = new Fragment(componentId, "nameFrag", ConfigurationListPage.this);+ Configuration configuration = rowModel.getObject();+ Link<Void> link = new BookmarkablePageLink<Void>("link", ConfigurationEditPage.class,+ ConfigurationEditPage.paramsOf(configuration));+ link.add(new Label("label", configuration.getName()));+ fragment.add(link);+ cellItem.add(fragment);}+});columns.add(new AbstractColumn<Configuration, Void>(Model.of("Actions")) {@@ -112,15 +120,6 @@ public class ConfigurationListPage extends ProjectSettingPage {Fragment fragment = new Fragment(componentId, "actionFrag", ConfigurationListPage.this);fragment.add(AttributeAppender.append("class", "actions"));- fragment.add(new Link<Void>("edit") {-- @Override- public void onClick() {- setResponsePage(ConfigurationEditPage.class, ConfigurationEditPage.paramsOf(rowModel.getObject()));- }-- });-Configuration configuration = rowModel.getObject();fragment.add(new Link<Void>("delete") {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/team/MembersEditBean.java b/core/src/main/java/io/onedev/server/web/page/project/setting/team/MembersEditBean.javanew file mode 100644index 0000000000..37fd7d4c47--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/team/MembersEditBean.java@@ -0,0 +1,27 @@+package io.onedev.server.web.page.project.setting.team;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.UserChoice;++@Editable+public class MembersEditBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<String> members = new ArrayList<>();++ @Editable+ @UserChoice+ public List<String> getMembers() {+ return members;+ }++ public void setMembers(List<String> members) {+ this.members = members;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/team/NewTeamPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/team/NewTeamPage.htmlnew file mode 100644index 0000000000..979222132a--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/team/NewTeamPage.html@@ -0,0 +1,15 @@+<wicket:extend>+ <div id="new-team">+ <div class="head">New Team</div>+ <div class="body">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback"></div>+ <div wicket:id="generalEditor"></div>+ <div wicket:id="membersEditor"></div>+ <div class="actions">+ <input class="btn btn-primary dirty-aware" value="Save" type="submit"></input>+ </div>+ </form>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/team/NewTeamPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/team/NewTeamPage.javanew file mode 100644index 0000000000..c75d06f3d5--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/team/NewTeamPage.java@@ -0,0 +1,89 @@+package io.onedev.server.web.page.project.setting.team;++import org.apache.wicket.Session;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.google.common.base.Preconditions;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.manager.MembershipManager;+import io.onedev.server.manager.TeamManager;+import io.onedev.server.manager.UserManager;+import io.onedev.server.model.Membership;+import io.onedev.server.model.Team;+import io.onedev.server.model.User;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.page.project.setting.ProjectSettingPage;++@SuppressWarnings("serial")+public class NewTeamPage extends ProjectSettingPage {++ public NewTeamPage(PageParameters params) {+ super(params);+ }++ private TeamManager getTeamManager() {+ return OneDev.getInstance(TeamManager.class);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Team team = new Team();+ MembersEditBean membersEditBean = new MembersEditBean();++ BeanEditor generalEditor = BeanContext.editBean("generalEditor", team);+ BeanEditor membersEditor = BeanContext.editBean("membersEditor", membersEditBean);++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ Team teamWithSameName = getTeamManager().find(getProject(), team.getName());+ if (teamWithSameName != null) {+ generalEditor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another team in the project");+ }+ if (!generalEditor.hasErrors(true)) {+ team.setProject(getProject());+ getTeamManager().save(team, null);++ MembershipManager membershipManager = OneDev.getInstance(MembershipManager.class);+ for (String member: membersEditBean.getMembers()) {+ User user = OneDev.getInstance(UserManager.class).findByName(member);+ Preconditions.checkNotNull(user);+ Membership membership = new Membership();+ membership.setTeam(team);+ membership.setUser(user);+ membershipManager.save(membership);+ }+ Session.get().success("Configuration created");+ setResponsePage(TeamListPage.class, TeamListPage.paramsOf(getProject()));+ }+ }++ };+ form.add(new NotificationPanel("feedback", form));++ form.add(generalEditor);+ form.add(membersEditor);++ add(form);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new TeamCssResourceReference()));+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamCssResourceReference.javanew file mode 100644index 0000000000..c698401cf8--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.setting.team;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class TeamCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public TeamCssResourceReference() {+ super(TeamCssResourceReference.class, "team.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamEditPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamEditPage.htmlnew file mode 100644index 0000000000..3e0237003d--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamEditPage.html@@ -0,0 +1,13 @@+<wicket:extend>+ <div class="team detail">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback"></div>+ <div wicket:id="generalEditor"></div>+ <div wicket:id="membersEditor"></div>+ <div class="actions">+ <input class="btn btn-primary dirty-aware" value="Save" type="submit"></input>+ <a wicket:id="delete" class="delete btn btn-danger pull-right">Delete</a>+ </div>+ </form>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamEditPage.javanew file mode 100644index 0000000000..c8d9b454f3--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamEditPage.java@@ -0,0 +1,125 @@+package io.onedev.server.web.page.project.setting.team;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.List;++import org.apache.wicket.Session;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.manager.MembershipManager;+import io.onedev.server.manager.TeamManager;+import io.onedev.server.manager.UserManager;+import io.onedev.server.model.Team;+import io.onedev.server.model.User;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.page.project.setting.ProjectSettingPage;+import io.onedev.server.web.util.ConfirmOnClick;++@SuppressWarnings("serial")+public class TeamEditPage extends ProjectSettingPage {++ private static final String PARAM_TEAM = "team";++ private final Long teamId;++ private final String oldName;++ public TeamEditPage(PageParameters params) {+ super(params);++ teamId = params.get(PARAM_TEAM).toOptionalLong();+ oldName = getTeam().getName();+ }++ private Team getTeam() {+ return getTeamManager().load(teamId);+ }++ private TeamManager getTeamManager() {+ return OneDev.getInstance(TeamManager.class);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Team team = getTeam();+ MembersEditBean membersEditBean = new MembersEditBean();++ List<User> members = new ArrayList<>(team.getMembers());+ Collections.sort(members);+ for (User member: members)+ membersEditBean.getMembers().add(member.getName());++ BeanEditor generalEditor = BeanContext.editBean("generalEditor", team);+ BeanEditor membersEditor = BeanContext.editBean("membersEditor", membersEditBean);++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ Team teamWithSameName = getTeamManager().find(getProject(), team.getName());+ if (teamWithSameName != null && !teamWithSameName.equals(team)) {+ generalEditor.getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another team in the project");+ }+ if (!generalEditor.hasErrors(true)) {+ Team reloaded = getTeam();+ generalEditor.getBeanDescriptor().copyProperties(team, reloaded);+ getTeamManager().save(reloaded, oldName);++ Collection<User> members = new ArrayList<>();+ for (String member: membersEditBean.getMembers()) {+ members.add(OneDev.getInstance(UserManager.class).findByName(member));+ }++ OneDev.getInstance(MembershipManager.class).assignMembers(reloaded, members);+ setResponsePage(TeamListPage.class, TeamListPage.paramsOf(getProject()));+ Session.get().success("Team saved");+ }+ }++ };+ form.add(new NotificationPanel("feedback", form));++ form.add(generalEditor);+ form.add(membersEditor);++ form.add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ OneDev.getInstance(TeamManager.class).delete(getTeam());+ setResponsePage(TeamListPage.class, TeamListPage.paramsOf(getProject()));+ }++ }.add(new ConfirmOnClick("Do you really want to delete this team?")));++ add(form);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new TeamCssResourceReference()));+ }++ public static PageParameters paramsOf(Team team) {+ PageParameters params = paramsOf(team.getProject());+ params.add(PARAM_TEAM, team.getId());+ return params;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.htmlnew file mode 100644index 0000000000..8989c2a8ce--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.html@@ -0,0 +1,21 @@+<wicket:extend>+ <div class="team list">+ <div class="head clearfix">+ <div class="pull-left clearable-wrapper">+ <input wicket:id="filterTeams" class="form-control search" placeholder="Filter by name"></input>+ </div>+ <div class="pull-left">+ <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New Team</a>+ </div>+ </div>+ <div class="body">+ <table wicket:id="teams" class="teams table table-hover"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="nameFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="actionFrag">+ <a wicket:id="delete" title="Delete this team"><i class="fa fa-trash"></i></a>+ </wicket:fragment>+</wicket:extend>diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.javanew file mode 100644index 0000000000..353a0f98f7--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.java@@ -0,0 +1,208 @@+package io.onedev.server.web.page.project.setting.team;++import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+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.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;++import io.onedev.server.OneDev;+import io.onedev.server.manager.TeamManager;+import io.onedev.server.model.Team;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.security.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.page.project.setting.ProjectSettingPage;+import io.onedev.server.web.util.ConfirmOnClick;+import io.onedev.server.web.util.PagingHistorySupport;++@SuppressWarnings("serial")+public class TeamListPage extends ProjectSettingPage {++ private static final String PARAM_CURRENT_PAGE = "currentPage";++ private DataTable<Team, Void> teamsTable;++ private String searchInput;++ public TeamListPage(PageParameters params) {+ super(params);+ }++ private EntityCriteria<Team> getCriteria() {+ EntityCriteria<Team> criteria = EntityCriteria.of(Team.class);+ criteria.add(Restrictions.eq("project", getProject()));+ if (searchInput != null)+ criteria.add(Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE));+ return criteria;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;+ add(searchField = new TextField<String>("filterTeams", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(teamsTable);+ }++ });++ add(new Link<Void>("addNew") {++ @Override+ public void onClick() {+ setResponsePage(NewTeamPage.class, NewTeamPage.paramsOf(getProject()));+ }++ });++ List<IColumn<Team, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<Team, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<Team>> cellItem, String componentId, IModel<Team> rowModel) {+ Fragment fragment = new Fragment(componentId, "nameFrag", TeamListPage.this);+ Team team = rowModel.getObject();+ Link<Void> link = new BookmarkablePageLink<Void>("link", TeamEditPage.class,+ TeamEditPage.paramsOf(team));+ link.add(new Label("label", team.getName()));+ fragment.add(link);+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<Team, Void>(Model.of("Privilege")) {++ @Override+ public void populateItem(Item<ICellPopulator<Team>> cellItem, String componentId,+ IModel<Team> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getPrivilege().toString()));+ }++ });++ columns.add(new AbstractColumn<Team, Void>(Model.of("Members")) {++ @Override+ public void populateItem(Item<ICellPopulator<Team>> cellItem, String componentId,+ IModel<Team> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getMemberships().size()));+ }++ });++ columns.add(new AbstractColumn<Team, Void>(Model.of("Actions")) {++ @Override+ public void populateItem(Item<ICellPopulator<Team>> cellItem, String componentId,+ IModel<Team> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionFrag", TeamListPage.this);+ fragment.add(AttributeAppender.append("class", "actions"));++ Team team = rowModel.getObject();+ fragment.add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ OneDev.getInstance(TeamManager.class).delete(rowModel.getObject());+ setResponsePage(TeamListPage.class, TeamListPage.paramsOf(getProject()));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator());+ }++ }.add(new ConfirmOnClick("Do you really want to delete team '" + team.getName() + "'?")));++ cellItem.add(fragment);+ }++ });++ SortableDataProvider<Team, Void> dataProvider = new SortableDataProvider<Team, Void>() {++ @Override+ public Iterator<? extends Team> iterator(long first, long count) {+ EntityCriteria<Team> criteria = getCriteria();+ criteria.addOrder(Order.asc("name"));+ return OneDev.getInstance(TeamManager.class).findRange(criteria, (int)first, (int)count).iterator();+ }++ @Override+ public long size() {+ return OneDev.getInstance(TeamManager.class).count(getCriteria());+ }++ @Override+ public IModel<Team> model(Team object) {+ Long id = object.getId();+ return new LoadableDetachableModel<Team>() {++ @Override+ protected Team load() {+ return OneDev.getInstance(TeamManager.class).load(id);+ }++ };+ }+ };++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ }++ };++ add(teamsTable = new HistoryAwareDataTable<>("teams", columns, dataProvider,+ WebConstants.PAGE_SIZE, pagingHistorySupport));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new TeamCssResourceReference()));+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/team/team.css b/core/src/main/java/io/onedev/server/web/page/project/setting/team/team.cssnew file mode 100644index 0000000000..cc06bfd948--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/team/team.css@@ -0,0 +1,8 @@+#new-team>.head {+ font-size: 18px;+ margin-bottom: 20px;+ font-weight: bold;+}+.team.list .actions a {+ color: #666;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.javaindex 1bb658154e..13dc7bd50f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java@@ -26,6 +26,7 @@ import io.onedev.server.OneDev;import io.onedev.server.git.Contribution;import io.onedev.server.git.Contributor;import io.onedev.server.manager.CommitInfoManager;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Constants;import io.onedev.server.util.Day;import io.onedev.server.web.component.avatar.AvatarLink;@@ -163,6 +164,11 @@ public class ProjectContribsPage extends ProjectStatsPage {});}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.javaindex b7fb8c713b..ffa658e893 100644--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java@@ -11,6 +11,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabLink;@@ -67,6 +68,11 @@ public abstract class ProjectStatsPage extends ProjectPage {add(new Tabbable("statsTabs", tabs).setOutputMarkupId(true));}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 3d0ed32ef2..498da02c01 100644--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -342,7 +342,7 @@ public class ProjectTagsPage extends ProjectPage {super.onConfigure();Project project = getProject();- if (SecurityUtils.canWrite(project)) {+ if (SecurityUtils.canWriteCode(project.getFacade())) {TagProtection protection = project.getTagProtection(tagName, getLoginUser());setEnabled(protection == null || !protection.isNoDeletion());} else {@@ -406,5 +406,10 @@ public class ProjectTagsPage extends ProjectPage {super.renderHead(response);response.render(CssHeaderItem.forReference(new ProjectTagsResourceReference()));}++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }}diff --git a/core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java b/core/src/main/java/io/onedev/server/web/page/security/LogoutPage.javaindex a80da62c98..14d5989c24 100644--- a/core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java+++ b/core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java@@ -2,7 +2,8 @@ package io.onedev.server.web.page.security;import org.apache.wicket.RestartResponseException;-import io.onedev.server.security.SecurityUtils;+import io.onedev.server.OneDev;+import io.onedev.server.manager.SettingManager;import io.onedev.server.web.WebSession;import io.onedev.server.web.page.base.BasePage;@@ -12,7 +13,7 @@ public class LogoutPage extends BasePage {public LogoutPage() {WebSession.get().logout();- if (SecurityUtils.canAccessPublic())+ if (getLoginUser() != null || OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess())getSession().warn("You've been logged out");throw new RestartResponseException(getApplication().getHomePage());diff --git a/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java b/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.javaindex 976c2a64f5..a0841a7963 100644--- a/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java@@ -101,7 +101,7 @@ public class AvatarEditPage extends UserPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canManage(getUser());+ return SecurityUtils.canAdministrate(getUser().getFacade());}}diff --git a/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.html b/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.htmlindex fd7f23d079..496d7f8221 100644--- a/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.html+++ b/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.html@@ -2,6 +2,18 @@<div class="new-user"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>+ <div class="form-group">+ <label>+ <input wicket:id="administrator" type="checkbox"/> Is Administrator+ </label>+ <div class="help-block">Check this to if the user is allowed to fork/create projects</div>+ </div>+ <div class="form-group">+ <label>+ <input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects+ </label>+ <div class="help-block">Check this to if the user is allowed to fork/create projects</div>+ </div><div class="actions clearfix"><input class="btn btn-primary dirty-aware pull-left" value="Create" type="submit"></input><div class="checkbox pull-left">diff --git a/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.java b/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.javaindex 5130475168..9081b1603d 100644--- a/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.java@@ -1,10 +1,13 @@package io.onedev.server.web.page.user;import java.util.List;+import java.util.Set;import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.Component;import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -14,6 +17,8 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;+import com.google.common.collect.Sets;+import io.onedev.launcher.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.manager.UserManager;@@ -31,13 +36,18 @@ public class NewUserPage extends LayoutPage {private User user = new User();+ private CheckBox administratorInput;++ private CheckBox canCreateProjectsInput;+private boolean continueToAdd;@Overrideprotected void onInitialize() {super.onInitialize();- BeanEditor editor = BeanContext.editBean("editor", user);+ Set<String> excludedProperties = Sets.newHashSet("administrator", "canCreateProjects");+ BeanEditor editor = BeanContext.editBean("editor", user, excludedProperties, true);Form<?> form = new Form<Void>("form") {@@ -57,6 +67,8 @@ public class NewUserPage extends LayoutPage {.addError("This email has already been used by another user.");}if (!editor.hasErrors(true)){+ user.setAdministrator(administratorInput.getModelObject());+ user.setCanCreateProjects(canCreateProjectsInput.getModelObject());user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(user.getPassword()));userManager.save(user, null);Session.get().success("New user created");@@ -64,13 +76,38 @@ public class NewUserPage extends LayoutPage {user = new User();replace(BeanContext.editBean("editor", user));} else {- setResponsePage(UserMembershipsPage.class, UserMembershipsPage.paramsOf(user));+ setResponsePage(UserListPage.class);}}}};form.add(editor);+ administratorInput = new CheckBox("administrator", Model.of(user.isAdministrator()));+ administratorInput.add(new OnChangeAjaxBehavior() {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ if (administratorInput.getModelObject())+ canCreateProjectsInput.setModelObject(true);+ target.add(canCreateProjectsInput);+ }++ });+ form.add(administratorInput);++ canCreateProjectsInput = new CheckBox("canCreateProjects", Model.of(user.isCanCreateProjects())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(!administratorInput.getModelObject());+ }++ };+ canCreateProjectsInput.setOutputMarkupId(true);+ form.add(canCreateProjectsInput);+form.add(new CheckBox("continueToAdd", new IModel<Boolean>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.html b/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.htmlnew file mode 100644index 0000000000..8864a3ae74--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.html@@ -0,0 +1,41 @@+<wicket:extend>+ <div class="project list">+ <div class="head clearfix">+ <div class="pull-left">+ <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></input>+ </div>+ <div class="pull-left">+ <input wicket:id="addNew" type="hidden" class="form-control"></input>+ </div>+ <div class="pull-left">+ <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>+ </div>+ </div>+ <table wicket:id="projects" class="projects table table-hover table-condensed"></table>+ </div>+ <wicket:fragment wicket:id="projectFrag">+ <a wicket:id="project"></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="teamsFrag">+ <span wicket:id="teams"></span>+ <a wicket:id="edit" title="Edit joined teams"><i class="fa fa-pencil"></i></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="teamsEditFrag">+ <form wicket:id="form" class="joined-teams">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Joined Teams+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="btn btn-primary" value="Save"></input>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.java b/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.javanew file mode 100644index 0000000000..b3b6645228--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.java@@ -0,0 +1,421 @@+package io.onedev.server.web.page.user;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;+import java.util.Set;+import java.util.stream.Collectors;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.manager.CacheManager;+import io.onedev.server.manager.MembershipManager;+import io.onedev.server.manager.ProjectManager;+import io.onedev.server.manager.TeamManager;+import io.onedev.server.model.Membership;+import io.onedev.server.model.Project;+import io.onedev.server.model.Team;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.facade.ProjectFacade;+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.selectioncolumn.SelectionColumn;+import io.onedev.server.web.component.link.ProjectLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.projectchoice.AbstractProjectChoiceProvider;+import io.onedev.server.web.component.projectchoice.ProjectChoiceResourceReference;+import io.onedev.server.web.component.select2.Response;+import io.onedev.server.web.component.select2.ResponseFiller;+import io.onedev.server.web.component.select2.SelectToAddChoice;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.ProjectAware;+import io.onedev.utils.StringUtils;+import io.onedev.utils.matchscore.MatchScoreProvider;+import io.onedev.utils.matchscore.MatchScoreUtils;++@SuppressWarnings("serial")+public class ParticipatedProjectsPage extends UserPage {++ private static final String PARAM_CURRENT_PAGE = "currentPage";++ private String searchInput;++ private DataTable<Project, Void> projectsTable;++ private SelectionColumn<Project, Void> selectionColumn;++ public ParticipatedProjectsPage(PageParameters params) {+ super(params);+ }++ private List<Project> getJoinedProjects() {+ Set<Project> projectSet = new HashSet<>();+ for (Membership membership: getUser().getMemberships()) {+ projectSet.add(membership.getTeam().getProject());+ }+ List<Project> projectList = new ArrayList<>(projectSet);+ Collections.sort(projectList, new Comparator<Project>() {++ @Override+ public int compare(Project o1, Project o2) {+ return o1.getName().compareTo(o2.getName());+ }++ });+ return projectList;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("filterProjects", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(projectsTable);+ }++ });++ add(new SelectToAddChoice<ProjectFacade>("addNew", new AbstractProjectChoiceProvider() {++ @Override+ public void query(String term, int page, Response<ProjectFacade> response) {+ List<ProjectFacade> notJoinedProjects = new ArrayList<>();++ Collection<Long> joinedProjectIds = getJoinedProjects().stream().map(it->it.getId()).collect(Collectors.toSet());+ for (ProjectFacade project: OneDev.getInstance(CacheManager.class).getProjects().values()) {+ if (!joinedProjectIds.contains(project.getId()))+ notJoinedProjects.add(project);+ }+ Collections.sort(notJoinedProjects);+ Collections.reverse(notJoinedProjects);++ MatchScoreProvider<ProjectFacade> matchScoreProvider = new MatchScoreProvider<ProjectFacade>() {++ @Override+ public double getMatchScore(ProjectFacade object) {+ return MatchScoreUtils.getMatchScore(object.getName(), term);+ }++ };++ notJoinedProjects = MatchScoreUtils.filterAndSort(notJoinedProjects, matchScoreProvider);++ new ResponseFiller<ProjectFacade>(response).fill(notJoinedProjects, page, WebConstants.PAGE_SIZE);+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator());+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add project...");+ getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult");+ getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup");+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, ProjectFacade selection) {+ new TeamsEditModal(target) {++ @Override+ public Project getProject() {+ return OneDev.getInstance(ProjectManager.class).load(selection.getId());+ }++ @Override+ protected void onSaved(AjaxRequestTarget target) {+ target.add(projectsTable);+ }++ };+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));+ }++ });++ AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ for (IModel<Project> model: selectionColumn.getSelections()) {+ for (Iterator<Membership> it = getUser().getMemberships().iterator(); it.hasNext();) {+ Membership membership = it.next();+ if (membership.getTeam().getProject().equals(model.getObject())) {+ OneDev.getInstance(MembershipManager.class).delete(membership);+ it.remove();+ }+ }+ }+ target.add(projectsTable);+ selectionColumn.getSelections().clear();+ target.add(this);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(selectionColumn != null && !selectionColumn.getSelections().isEmpty());+ }++ };+ deleteSelected.setOutputMarkupPlaceholderTag(true);+ add(deleteSelected);++ List<IColumn<Project, Void>> columns = new ArrayList<>();++ if (SecurityUtils.isAdministrator()) {+ selectionColumn = new SelectionColumn<Project, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ columns.add(selectionColumn);+ }++ columns.add(new AbstractColumn<Project, Void>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,+ IModel<Project> rowModel) {+ Fragment fragment = new Fragment(componentId, "projectFrag", ParticipatedProjectsPage.this);+ Project project = rowModel.getObject();+ String projectName = project.getName();+ fragment.add(new ProjectLink("project", project) {++ @Override+ public IModel<?> getBody() {+ return Model.of(projectName);+ }++ });+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<Project, Void>(Model.of("Joined Teams")) {++ @Override+ public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,+ IModel<Project> rowModel) {+ Fragment fragment = new Fragment(componentId, "teamsFrag", ParticipatedProjectsPage.this);+ fragment.add(new Label("teams", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ Project project = rowModel.getObject();+ List<String> teamNames = new ArrayList<>();+ for (Membership membership: getUser().getMemberships()) {+ if (membership.getTeam().getProject().equals(project))+ teamNames.add(membership.getTeam().getName());+ }+ Collections.sort(teamNames);+ return StringUtils.join(teamNames, ", ");+ }++ }));+ fragment.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new TeamsEditModal(target) {++ @Override+ public Project getProject() {+ return rowModel.getObject();+ }++ @Override+ protected void onSaved(AjaxRequestTarget target) {+ target.add(fragment);+ }++ };+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator());+ }++ });+ fragment.setOutputMarkupId(true);+ cellItem.add(fragment);+ }+ });++ SortableDataProvider<Project, Void> dataProvider = new SortableDataProvider<Project, Void>() {++ @Override+ public Iterator<? extends Project> iterator(long first, long count) {+ List<Project> projects = new ArrayList<>();+ for (Project project: getJoinedProjects()) {+ if (searchInput == null || project.getName().toLowerCase().contains(searchInput.toLowerCase()))+ projects.add(project);+ }++ if (first + count <= projects.size())+ return projects.subList((int)first, (int)(first+count)).iterator();+ else+ return projects.subList((int)first, projects.size()).iterator();+ }++ @Override+ public long size() {+ return getJoinedProjects().size();+ }++ @Override+ public IModel<Project> model(Project object) {+ Long projectId = object.getId();+ return new LoadableDetachableModel<Project>() {++ @Override+ protected Project load() {+ return OneDev.getInstance(ProjectManager.class).load(projectId);+ }++ };+ }+ };++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(getUser());+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ }++ };++ add(projectsTable = new HistoryAwareDataTable<Project, Void>("projects", columns,+ dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport));+ }++ private abstract class TeamsEditModal extends ModalPanel implements ProjectAware {++ public TeamsEditModal(AjaxRequestTarget target) {+ super(target);+ }++ @Override+ protected Component newContent(String id) {+ Fragment fragment = new Fragment(id, "teamsEditFrag", ParticipatedProjectsPage.this);+ Form<?> form = new Form<Void>("form");+ form.add(new NotificationPanel("feedback", form));++ TeamsEditBean bean = new TeamsEditBean();+ for (Membership membership: getUser().getMemberships()) {+ if (membership.getTeam().getProject().equals(getProject()))+ bean.getTeams().add(membership.getTeam().getName());+ }+ Collections.sort(bean.getTeams());++ form.add(BeanContext.editBean("editor", bean));++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ if (bean.getTeams().isEmpty()) {+ error("At least one team needs to be selected");+ target.add(form);+ } else {+ Collection<Team> teams = new ArrayList<>();+ for (String teamName: bean.getTeams())+ teams.add(OneDev.getInstance(TeamManager.class).find(getProject(), teamName));+ OneDev.getInstance(MembershipManager.class).assignTeams(getUser(), getProject(), teams);+ close();+ onSaved(target);+ }+ }++ });+ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.setOutputMarkupId(true);+ fragment.add(form);+ return fragment;+ }++ @Override+ public abstract Project getProject();++ protected abstract void onSaved(AjaxRequestTarget target);++ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java b/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.javaindex afaefd6b11..83d93d12f0 100644--- a/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java@@ -54,7 +54,7 @@ public class PasswordEditPage extends UserPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canManage(getUser());+ return SecurityUtils.canAdministrate(getUser().getFacade());}}diff --git a/core/src/main/java/io/onedev/server/web/page/user/TeamsEditBean.java b/core/src/main/java/io/onedev/server/web/page/user/TeamsEditBean.javanew file mode 100644index 0000000000..e644c90ac1--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/user/TeamsEditBean.java@@ -0,0 +1,27 @@+package io.onedev.server.web.page.user;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.TeamChoice;++@Editable+public class TeamsEditBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<String> teams = new ArrayList<>();++ @Editable+ @TeamChoice+ public List<String> getTeams() {+ return teams;+ }++ public void setTeams(List<String> teams) {+ this.teams = teams;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java b/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.javaindex 645fd52377..da3ef0ea75 100644--- a/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java@@ -71,7 +71,7 @@ public class TokenGeneratePage extends UserPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canManage(getUser());+ return SecurityUtils.canAdministrate(getUser().getFacade());}}diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.html b/core/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.htmldeleted file mode 100644index 1d4864de78..0000000000--- a/core/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.html+++ /dev/null@@ -1,23 +0,0 @@-<wicket:extend>- <div class="authorization list">- <div class="head clearfix">- <div class="pull-left clearable-wrapper">- <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></input>- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control"></input>- </div>- <div class="pull-left">- <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>- </div>- </div>- <table wicket:id="authorizations" class="authorizations table table-hover table-condensed"></table>- </div>- <wicket:fragment wicket:id="projectFrag">- <a wicket:id="project"></a>- </wicket:fragment>- <wicket:fragment wicket:id="privilegeFrag">- <a wicket:id="dropdown" class="btn btn-xs btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="otherSources" class="other-sources" title="This permission is granted from other sources, click for details"><i class="fa fa-warning"></i></a>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.javadeleted file mode 100644index 784a8ab3bb..0000000000--- a/core/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.java+++ /dev/null@@ -1,488 +0,0 @@-package io.onedev.server.web.page.user;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;-import java.util.HashMap;-import java.util.HashSet;-import java.util.Iterator;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-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.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserAuthorizationManager;-import io.onedev.server.model.Project;-import io.onedev.server.model.UserAuthorization;-import io.onedev.server.security.ProjectPrivilege;-import io.onedev.server.security.permission.SystemAdministration;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;-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.selectioncolumn.SelectionColumn;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.projectchoice.AbstractProjectChoiceProvider;-import io.onedev.server.web.component.projectchoice.ProjectChoiceResourceReference;-import io.onedev.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel;-import io.onedev.server.web.component.projectprivilege.privilegesource.PrivilegeSourcePanel;-import io.onedev.server.web.component.select2.Response;-import io.onedev.server.web.component.select2.ResponseFiller;-import io.onedev.server.web.component.select2.SelectToAddChoice;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.utils.matchscore.MatchScoreProvider;-import io.onedev.utils.matchscore.MatchScoreUtils;--@SuppressWarnings("serial")-public class UserAuthorizationsPage extends UserPage {-- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private String searchInput;-- private DataTable<Long, Void> authorizationsTable;-- private SelectionColumn<Long, Void> selectionColumn;-- private IModel<Map<Long, UserAuthorizationFacade>> explicitProjectAuthorizationsModel =- new LoadableDetachableModel<Map<Long, UserAuthorizationFacade>>() {-- @Override- protected Map<Long, UserAuthorizationFacade> load() {- Map<Long, UserAuthorizationFacade> authorizations = new HashMap<>();- for (UserAuthorizationFacade authorization:- OneDev.getInstance(CacheManager.class).getUserAuthorizations().values()) {- if (authorization.getUserId().equals(getUser().getId()))- authorizations.put(authorization.getProjectId(), authorization);- }- return authorizations;- }-- };- private IModel<Map<Long, ProjectPrivilege>> projectAuthorizationsModel =- new LoadableDetachableModel<Map<Long, ProjectPrivilege>>() {-- @Override- protected Map<Long, ProjectPrivilege> load() {- Map<Long, ProjectPrivilege> projectAuthorizations = new HashMap<>();- Collection<Long> projectsAuthorizedFromOtherSources = new HashSet<>();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);-- if (getUser().asSubject().isPermitted(new SystemAdministration())) {- for (ProjectFacade project: cacheManager.getProjects().values()) {- projectAuthorizations.put(project.getId(), ProjectPrivilege.ADMIN);- projectsAuthorizedFromOtherSources.add(project.getId());- }- } else {- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getUserId().equals(getUser().getId()))- projectAuthorizations.put(authorization.getProjectId(), authorization.getPrivilege());- }- Collection<Long> groupIds = new HashSet<>();- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (membership.getUserId().equals(getUser().getId()))- groupIds.add(membership.getGroupId());- }- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (groupIds.contains(authorization.getGroupId())) {- ProjectPrivilege privilege = projectAuthorizations.get(authorization.getProjectId());- if (privilege == null || authorization.getPrivilege().implies(privilege))- projectAuthorizations.put(authorization.getProjectId(), authorization.getPrivilege());- projectsAuthorizedFromOtherSources.add(authorization.getProjectId());- }- }- for (ProjectFacade project: cacheManager.getProjects().values()) {- if (project.isPublicRead()) {- if (!projectAuthorizations.containsKey(project.getId()))- projectAuthorizations.put(project.getId(), ProjectPrivilege.READ);- projectsAuthorizedFromOtherSources.add(project.getId());- }- }- }-- Map<Long, UserAuthorizationFacade> explicitProjectAuthorizations = getExplicitProjectAuthorizations();- List<Long> projectIds = new ArrayList<>(projectAuthorizations.keySet());- Collections.sort(projectIds, new Comparator<Long>() {-- @Override- public int compare(Long o1, Long o2) {- if (projectsAuthorizedFromOtherSources.contains(o1)) {- if (projectsAuthorizedFromOtherSources.contains(o2)) {- return o1.compareTo(o2);- } else {- return 1;- }- } else {- if (projectsAuthorizedFromOtherSources.contains(o2)) {- return -1;- } else {- return explicitProjectAuthorizations.get(o2).getId()- .compareTo(explicitProjectAuthorizations.get(o1).getId());- }- }- }-- });-- Map<Long, ProjectPrivilege> sortedProjectAuthorizations = new LinkedHashMap<>();- for (Long projectId: projectIds)- sortedProjectAuthorizations.put(projectId, projectAuthorizations.get(projectId));-- return sortedProjectAuthorizations;- }-- };-- public UserAuthorizationsPage(PageParameters params) {- super(params);- }-- @Override- protected void onDetach() {- explicitProjectAuthorizationsModel.detach();- projectAuthorizationsModel.detach();- super.onDetach();- }-- private Map<Long, UserAuthorizationFacade> getExplicitProjectAuthorizations() {- return explicitProjectAuthorizationsModel.getObject();- }-- private Map<Long, ProjectPrivilege> getProjectAuthorizations() {- return projectAuthorizationsModel.getObject();- }-- private boolean isPrivilegeFromOtherSources(Long projectId) {- UserAuthorizationFacade authorization = getExplicitProjectAuthorizations().get(projectId);- ProjectPrivilege privilege = getProjectAuthorizations().get(projectId);- return authorization == null || !authorization.getPrivilege().implies(privilege);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("filterProjects", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(authorizationsTable);- }-- });-- add(new SelectToAddChoice<ProjectFacade>("addNew", new AbstractProjectChoiceProvider() {-- @Override- public void query(String term, int page, Response<ProjectFacade> response) {- List<ProjectFacade> notAuthorizedProjects = new ArrayList<>();-- for (ProjectFacade project: OneDev.getInstance(CacheManager.class).getProjects().values()) {- if (!getProjectAuthorizations().containsKey(project.getId()))- notAuthorizedProjects.add(project);- }- Collections.sort(notAuthorizedProjects);- Collections.reverse(notAuthorizedProjects);-- MatchScoreProvider<ProjectFacade> matchScoreProvider = new MatchScoreProvider<ProjectFacade>() {-- @Override- public double getMatchScore(ProjectFacade object) {- return MatchScoreUtils.getMatchScore(object.getName(), term);- }-- };-- notAuthorizedProjects = MatchScoreUtils.filterAndSort(notAuthorizedProjects, matchScoreProvider);-- new ResponseFiller<ProjectFacade>(response).fill(notAuthorizedProjects, page, WebConstants.PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Authorize project...");- getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult");- getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, ProjectFacade selection) {- UserAuthorization authorization = new UserAuthorization();- authorization.setUser(getUser());- authorization.setProject(OneDev.getInstance(ProjectManager.class).load(selection.getId()));- OneDev.getInstance(UserAuthorizationManager.class).save(authorization);- target.add(authorizationsTable);- Session.get().success("Project added");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));- }-- });-- AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<UserAuthorization> authorizationsToDelete = new HashSet<>();- Map<Long, UserAuthorizationFacade> explicitProjectAuthorizations = getExplicitProjectAuthorizations();- UserAuthorizationManager userAuthorizationManager = OneDev.getInstance(UserAuthorizationManager.class);- for (IModel<Long> model: selectionColumn.getSelections()) {- UserAuthorizationFacade authorization = explicitProjectAuthorizations.get(model.getObject());- if (authorization != null) {- authorizationsToDelete.add(userAuthorizationManager.load(authorization.getId()));- explicitProjectAuthorizations.remove(model.getObject());- }- }- userAuthorizationManager.delete(authorizationsToDelete);- target.add(authorizationsTable);- selectionColumn.getSelections().clear();- target.add(this);- }-- @Override- protected void onConfigure() {- super.onConfigure();-- boolean hasLocalPrivileges = false;- for (IModel<Long> model: selectionColumn.getSelections()) {- if (!isPrivilegeFromOtherSources(model.getObject())) {- hasLocalPrivileges = true;- break;- }- }- setVisible(hasLocalPrivileges);- }-- };- deleteSelected.setOutputMarkupPlaceholderTag(true);- add(deleteSelected);-- List<IColumn<Long, Void>> columns = new ArrayList<>();-- selectionColumn = new SelectionColumn<Long, Void>() {-- @Override- protected void onSelectionChange(AjaxRequestTarget target) {- target.add(deleteSelected);- }-- };- columns.add(selectionColumn);-- columns.add(new AbstractColumn<Long, Void>(Model.of("Project")) {-- @Override- public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId,- IModel<Long> rowModel) {- Fragment fragment = new Fragment(componentId, "projectFrag", UserAuthorizationsPage.this);- Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject());- String projectName = project.getName();- fragment.add(new BookmarkablePageLink<Void>("project", ProjectBlobPage.class,- ProjectBlobPage.paramsOf(project)) {-- @Override- public IModel<?> getBody() {- return Model.of(projectName);- }-- });- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<Long, Void>(Model.of("Permission")) {-- @Override- public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId,- IModel<Long> rowModel) {- Fragment fragment = new Fragment(componentId, "privilegeFrag", UserAuthorizationsPage.this) {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- String script = String.format(""- + "$('#%s').closest('tr').find('.row-selector input').prop('disabled', %b);",- getMarkupId(), isPrivilegeFromOtherSources(rowModel.getObject()));-- response.render(OnDomReadyHeaderItem.forScript(script));- }-- };- WebMarkupContainer dropdown = new DropdownLink("dropdown") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- ProjectPrivilege privilege = getProjectAuthorizations().get(rowModel.getObject());- return new PrivilegeSelectionPanel(id, privilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {- dropdown.close();- Long projectId = rowModel.getObject();-- Map<Long, UserAuthorizationFacade> explicitProjectAuthorizations =- getExplicitProjectAuthorizations();- UserAuthorizationFacade userAuthorizationFacade =- explicitProjectAuthorizations.get(projectId);- UserAuthorizationManager userAuthorizationManager =- OneDev.getInstance(UserAuthorizationManager.class);- UserAuthorization userAuthorization;- if (userAuthorizationFacade == null) {- userAuthorization = new UserAuthorization();- userAuthorization.setUser(getUser());- userAuthorization.setProject(- OneDev.getInstance(ProjectManager.class).load(projectId));- } else {- userAuthorization = userAuthorizationManager.load(userAuthorizationFacade.getId());- }- userAuthorization.setPrivilege(privilege);- userAuthorizationManager.save(userAuthorization);- explicitProjectAuthorizations.put(projectId, userAuthorization.getFacade());-- target.add(fragment);-- if (getProjectAuthorizations().get(projectId) != privilege) {- Session.get().warn("Specified permission is not taking effect as a higher "- + "permission is granted from other sources");- }- }-- };- }-- };- dropdown.add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return getProjectAuthorizations().get(rowModel.getObject()).name();- }-- }));- fragment.add(dropdown);-- fragment.add(new DropdownLink("otherSources") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(isPrivilegeFromOtherSources(rowModel.getObject()));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject());- return new PrivilegeSourcePanel(id, getUser(), project,- getProjectAuthorizations().get(project.getId()));- }-- });-- fragment.setOutputMarkupId(true);- cellItem.add(fragment);- }- });-- SortableDataProvider<Long, Void> dataProvider = new SortableDataProvider<Long, Void>() {-- private List<Long> getProjectIds() {- List<Long> projectIds = new ArrayList<>(getProjectAuthorizations().keySet());- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);-- return MatchScoreUtils.filterAndSort(projectIds, new MatchScoreProvider<Long>() {-- @Override- public double getMatchScore(Long object) {- return MatchScoreUtils.getMatchScore(cacheManager.getProject(object).getName(), searchInput);- }-- });- }-- @Override- public Iterator<? extends Long> iterator(long first, long count) {- List<Long> projectIds = getProjectIds();- if (first + count <= projectIds.size())- return projectIds.subList((int)first, (int)(first+count)).iterator();- else- return projectIds.subList((int)first, projectIds.size()).iterator();- }-- @Override- public long size() {- return getProjectIds().size();- }-- @Override- public IModel<Long> model(Long object) {- return Model.of(object);- }- };-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getUser());- params.add(PARAM_CURRENT_PAGE, currentPage+1);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;- }-- };-- add(authorizationsTable = new HistoryAwareDataTable<Long, Void>("authorizations", columns,- dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport));- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.javaindex e1b9f97d46..81e5fcdf79 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java@@ -42,6 +42,7 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.utils.StringUtils;@SuppressWarnings("serial")public class UserListPage extends LayoutPage {@@ -122,6 +123,27 @@ public class UserListPage extends LayoutPage {}});+ columns.add(new AbstractColumn<User, Void>(Model.of("Administrator")) {++ @Override+ public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId,+ IModel<User> rowModel) {+ User user = rowModel.getObject();+ cellItem.add(new Label(componentId, StringUtils.describe(user.isRoot() || user.isAdministrator())));+ }+ });++ columns.add(new AbstractColumn<User, Void>(Model.of("Can Create Projects")) {++ @Override+ public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId,+ IModel<User> rowModel) {+ User user = rowModel.getObject();+ cellItem.add(new Label(componentId,+ StringUtils.describe(user.isRoot() || user.isAdministrator() || user.isCanCreateProjects())));+ }+ });+columns.add(new AbstractColumn<User, Void>(Model.of("Actions")) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.java b/core/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.javadeleted file mode 100644index e8d1dcbcc4..0000000000--- a/core/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.java+++ /dev/null@@ -1,281 +0,0 @@-package io.onedev.server.web.page.user;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-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.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.MembershipManager;-import io.onedev.server.model.Membership;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.facade.MembershipFacade;-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.selectioncolumn.SelectionColumn;-import io.onedev.server.web.component.groupchoice.AbstractGroupChoiceProvider;-import io.onedev.server.web.component.groupchoice.GroupChoiceResourceReference;-import io.onedev.server.web.component.select2.Response;-import io.onedev.server.web.component.select2.ResponseFiller;-import io.onedev.server.web.component.select2.SelectToAddChoice;-import io.onedev.server.web.page.group.GroupProfilePage;-import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.utils.matchscore.MatchScoreProvider;-import io.onedev.utils.matchscore.MatchScoreUtils;--@SuppressWarnings("serial")-public class UserMembershipsPage extends UserPage {-- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private String searchInput;-- private DataTable<Membership, Void> membershipsTable;-- private SelectionColumn<Membership, Void> selectionColumn;-- public UserMembershipsPage(PageParameters params) {- super(params);- }-- private EntityCriteria<Membership> getCriteria() {- EntityCriteria<Membership> criteria = EntityCriteria.of(Membership.class);- if (searchInput != null)- criteria.createCriteria("group").add(Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE));- criteria.add(Restrictions.eq("user", getUser()));- return criteria;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("filterGroups", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(membershipsTable);- }-- });-- add(new SelectToAddChoice<GroupFacade>("addNew", new AbstractGroupChoiceProvider() {-- @Override- public void query(String term, int page, Response<GroupFacade> response) {- List<GroupFacade> notMembersOf = new ArrayList<>();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- Set<Long> groupIds = new HashSet<>();- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (membership.getUserId().equals(getUser().getId()))- groupIds.add(membership.getGroupId());- }- for (GroupFacade group: cacheManager.getGroups().values()) {- if (!groupIds.contains(group.getId()))- notMembersOf.add(group);- }- Collections.sort(notMembersOf);- Collections.reverse(notMembersOf);-- notMembersOf = MatchScoreUtils.filterAndSort(notMembersOf, new MatchScoreProvider<GroupFacade>() {-- @Override- public double getMatchScore(GroupFacade object) {- return MatchScoreUtils.getMatchScore(object.getName(), term);- }-- });-- new ResponseFiller<>(response).fill(notMembersOf, page, WebConstants.PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add to group...");- getSettings().setFormatResult("onedev.server.groupChoiceFormatter.formatResult");- getSettings().setFormatSelection("onedev.server.groupChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("onedev.server.groupChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, GroupFacade selection) {- Membership membership = new Membership();- membership.setUser(getUser());- membership.setGroup(OneDev.getInstance(GroupManager.class).load(selection.getId()));- OneDev.getInstance(MembershipManager.class).save(membership);- target.add(membershipsTable);- Session.get().success("Group added");- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.isAdministrator());- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new GroupChoiceResourceReference()));- }-- });-- AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<Membership> membershipsToDelete = new HashSet<>();- for (IModel<Membership> model: selectionColumn.getSelections()) {- membershipsToDelete.add(model.getObject());- }- OneDev.getInstance(MembershipManager.class).delete(membershipsToDelete);- target.add(membershipsTable);- selectionColumn.getSelections().clear();- target.add(this);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!selectionColumn.getSelections().isEmpty());- }-- };- deleteSelected.setOutputMarkupPlaceholderTag(true);- add(deleteSelected);-- List<IColumn<Membership, Void>> columns = new ArrayList<>();-- selectionColumn = new SelectionColumn<Membership, Void>() {-- @Override- protected void onSelectionChange(AjaxRequestTarget target) {- target.add(deleteSelected);- }-- };- if (SecurityUtils.isAdministrator())- columns.add(selectionColumn);-- columns.add(new AbstractColumn<Membership, Void>(Model.of("Name")) {-- @Override- public void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,- IModel<Membership> rowModel) {- Membership membership = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "groupFrag", UserMembershipsPage.this);- Link<Void> link = new BookmarkablePageLink<Void>("group", GroupProfilePage.class,- GroupProfilePage.paramsOf(membership.getGroup())) {-- @Override- public IModel<?> getBody() {- return Model.of(rowModel.getObject().getGroup().getName());- }-- };- fragment.add(link);- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<Membership, Void>(Model.of("Description")) {-- @Override- public void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,- IModel<Membership> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getGroup().getDescription()));- }- });-- SortableDataProvider<Membership, Void> dataProvider = new SortableDataProvider<Membership, Void>() {-- @Override- public Iterator<? extends Membership> iterator(long first, long count) {- EntityCriteria<Membership> criteria = getCriteria();- criteria.addOrder(Order.desc("id"));- return OneDev.getInstance(MembershipManager.class).findRange(criteria, (int)first,- (int)count).iterator();- }-- @Override- public long size() {- return OneDev.getInstance(MembershipManager.class).count(getCriteria());- }-- @Override- public IModel<Membership> model(Membership object) {- Long id = object.getId();- return new LoadableDetachableModel<Membership>() {-- @Override- protected Membership load() {- return OneDev.getInstance(MembershipManager.class).load(id);- }-- };- }- };-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getUser());- params.add(PARAM_CURRENT_PAGE, currentPage+1);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;- }-- };-- add(membershipsTable = new HistoryAwareDataTable<Membership, Void>("memberships", columns, dataProvider,- WebConstants.PAGE_SIZE, pagingHistorySupport));- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserPage.java b/core/src/main/java/io/onedev/server/web/page/user/UserPage.javaindex c35d192223..16ac83c278 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/UserPage.java@@ -62,7 +62,7 @@ public abstract class UserPage extends LayoutPage {}};- if (!SecurityUtils.canManage(getUser())) {+ if (!SecurityUtils.canAdministrate(getUser().getFacade())) {avatarLink.setEnabled(false);}avatarLink.add(new Avatar("avatar", userModel.getObject()));@@ -76,16 +76,14 @@ public abstract class UserPage extends LayoutPage {List<PageTab> tabs = new ArrayList<>();tabs.add(new UserTab("Profile", "fa fa-fw fa-list-alt", UserProfilePage.class));- if (SecurityUtils.canManage(getUser())) {+ if (SecurityUtils.canAdministrate(getUser().getFacade())) {tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));if (StringUtils.isNotBlank(getUser().getPassword()))tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", PasswordEditPage.class));tabs.add(new UserTab("Access Token", "fa fa-fw fa-key", TokenGeneratePage.class));}- tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));- if (SecurityUtils.isAdministrator())- tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));+ tabs.add(new UserTab("Participated Projects", "fa fa-ext fa-fw fa-repo", ParticipatedProjectsPage.class));return tabs;}diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.html b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.htmlindex e0dc33a953..43b437dc62 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.html+++ b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.html@@ -3,6 +3,22 @@<wicket:fragment wicket:id="editFrag"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>+ <wicket:enclosure child="administrator">+ <div class="form-group">+ <label>+ <input wicket:id="administrator" type="checkbox"/> Is Administrator+ </label>+ <div class="help-block">Check this to if the user is allowed to fork/create projects</div>+ </div>+ </wicket:enclosure>+ <wicket:enclosure child="canCreateProjects">+ <div class="form-group">+ <label>+ <input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects+ </label>+ <div class="help-block">Check this to if the user is allowed to fork/create projects</div>+ </div>+ </wicket:enclosure><div class="actions clearfix"><input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input><a wicket:id="delete" class="btn btn-danger pull-right">Delete</a>diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.javaindex f248d2bfaf..aba90f889a 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java@@ -3,10 +3,14 @@ package io.onedev.server.web.page.user;import java.io.Serializable;import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;+import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;@@ -28,6 +32,10 @@ public class UserProfilePage extends UserPage {private String oldName;+ private CheckBox administratorInput;++ private CheckBox canCreateProjectsInput;+public UserProfilePage(PageParameters params) {super(params);}@@ -36,7 +44,7 @@ public class UserProfilePage extends UserPage {protected void onInitialize() {super.onInitialize();- if (SecurityUtils.canManage(getUser())) {+ if (SecurityUtils.canAdministrate(getUser().getFacade())) {Fragment fragment = new Fragment("content", "editFrag", this);editor = BeanContext.editModel("editor", new IModel<Serializable>() {@@ -56,7 +64,7 @@ public class UserProfilePage extends UserPage {editor.getBeanDescriptor().copyProperties(object, getUser());}- }, Sets.newHashSet("password"), true);+ }, Sets.newHashSet("password", "administrator", "canCreateProjects"), true);Form<?> form = new Form<Void>("form") {@@ -77,6 +85,10 @@ public class UserProfilePage extends UserPage {.addError("This email has already been used by another user.");}if (!editor.hasErrors(true)) {+ if (SecurityUtils.isAdministrator()) {+ user.setAdministrator(administratorInput.getModelObject());+ user.setCanCreateProjects(canCreateProjectsInput.getModelObject());+ }userManager.save(user, oldName);Session.get().success("Profile updated");setResponsePage(UserProfilePage.class, UserProfilePage.paramsOf(user));@@ -86,6 +98,44 @@ public class UserProfilePage extends UserPage {};form.add(editor);+ administratorInput = new CheckBox("administrator", Model.of(getUser().isAdministrator() || getUser().isRoot())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator()+ && !getUser().isRoot()+ && !getUser().equals(getLoginUser()));+ }++ };+ administratorInput.add(new OnChangeAjaxBehavior() {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ if (administratorInput.getModelObject())+ canCreateProjectsInput.setModelObject(true);+ target.add(canCreateProjectsInput);+ }++ });+ form.add(administratorInput);++ canCreateProjectsInput = new CheckBox("canCreateProjects", Model.of(getUser().isCanCreateProjects())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator()+ && !getUser().isRoot()+ && !getUser().equals(getLoginUser()));+ setEnabled(!administratorInput.getModelObject());+ }++ };+ canCreateProjectsInput.setOutputMarkupId(true);+ form.add(canCreateProjectsInput);+form.add(new Link<Void>("delete") {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/user/user.css b/core/src/main/java/io/onedev/server/web/page/user/user.cssindex a0c4f9d78a..2d32965393 100644--- a/core/src/main/java/io/onedev/server/web/page/user/user.css+++ b/core/src/main/java/io/onedev/server/web/page/user/user.css@@ -27,16 +27,13 @@margin-right: 8px;}-#user .authorization.list a.other-sources {- margin-left: 4px;- color: #DCB508;- vertical-align: middle;-}--#user .membership.list .head .select2-container,-#user .authorization.list .head .select2-container {+#user .project.list .head .select2-container {width: 240px;}+#user .project.list table a {+ color: #666;+ margin-left: 4px;+}.user.list .actions a {color: #666;diff --git a/core/src/main/java/io/onedev/server/web/util/ComponentContext.java b/core/src/main/java/io/onedev/server/web/util/ComponentContext.javaindex 63d02a91ed..c122b2da8c 100644--- a/core/src/main/java/io/onedev/server/web/util/ComponentContext.java+++ b/core/src/main/java/io/onedev/server/web/util/ComponentContext.java@@ -1,7 +1,6 @@package io.onedev.server.web.util;import org.apache.wicket.Component;-import org.apache.wicket.Page;import com.google.common.base.Preconditions;@@ -9,7 +8,6 @@ import io.onedev.server.model.Project;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.web.page.project.ProjectPage;public class ComponentContext extends OneContext {@@ -21,9 +19,9 @@ public class ComponentContext extends OneContext {@Overridepublic Project getProject() {- Page page = component.getPage();- if (page instanceof ProjectPage)- return ((ProjectPage)page).getProject();+ ProjectAware projectAware = component.findParent(ProjectAware.class);+ if (projectAware != null)+ return projectAware.getProject();elsereturn null;}diff --git a/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java b/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.javaindex 26dfe45879..31fec69b7b 100644--- a/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java+++ b/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java@@ -87,7 +87,7 @@ public class ProjectAttachmentSupport implements AttachmentSupport {@Overridepublic String saveAttachment(String suggestedAttachmentName, InputStream attachmentStream) {- Preconditions.checkState(SecurityUtils.canRead(getProject()));+ Preconditions.checkState(SecurityUtils.canReadCode(getProject()));String attachmentName = suggestedAttachmentName;File attachmentDir = getAttachmentDir();diff --git a/core/src/main/java/io/onedev/server/web/util/ProjectAware.java b/core/src/main/java/io/onedev/server/web/util/ProjectAware.javanew file mode 100644index 0000000000..2f93094382--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/util/ProjectAware.java@@ -0,0 +1,9 @@+package io.onedev.server.web.util;++import io.onedev.server.model.Project;++public interface ProjectAware {++ Project getProject();++}diff --git a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 29ac20db71..f3ab1acb87 100644--- a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -17,11 +17,10 @@ import io.onedev.server.OneDev;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.model.Group;import io.onedev.server.model.Project;-import io.onedev.server.security.ProjectPrivilege;+import io.onedev.server.model.Team;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.utils.Range;@@ -84,11 +83,11 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestGroup(String matchWith, @Nullable String escapeChars) {+ public static List<InputSuggestion> suggestTeam(Project project, String matchWith, @Nullable String escapeChars) {String lowerCaseMatchWith = matchWith.toLowerCase();List<InputSuggestion> suggestions = new ArrayList<>();- for (Group group: OneDev.getInstance(GroupManager.class).findAll()) {- String name = group.getName();+ for (Team team: project.getTeams()) {+ String name = team.getName();int index = name.toLowerCase().indexOf(lowerCaseMatchWith);if (index != -1) {Range match = new Range(index, index+lowerCaseMatchWith.length());diff --git a/core/src/main/java/io/onedev/server/web/util/model/AffinalProjectsModel.java b/core/src/main/java/io/onedev/server/web/util/model/AffinalProjectsModel.javaindex 5b086629b3..c6ca277bf0 100644--- a/core/src/main/java/io/onedev/server/web/util/model/AffinalProjectsModel.java+++ b/core/src/main/java/io/onedev/server/web/util/model/AffinalProjectsModel.java@@ -25,7 +25,7 @@ public class AffinalProjectsModel extends LoadableDetachableModel<Collection<ProProject project = OneDev.getInstance(Dao.class).load(Project.class, projectId);List<Project> affinals = project.getForkRoot().getForkDescendants();for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {- if (!SecurityUtils.canRead(it.next()))+ if (!SecurityUtils.canReadIssues(it.next().getFacade()))it.remove();}return affinals;diff --git a/core/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.java b/core/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.javaindex 18ae9964ad..a9aa054009 100644--- a/core/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.java+++ b/core/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.java@@ -61,7 +61,7 @@ public class ArchiveResource extends AbstractResource {throw new IllegalArgumentException("format parameter should be specified either zip or tar.gz");}- if (!SecurityUtils.canRead(project))+ if (!SecurityUtils.canReadCode(project.getFacade()))throw new UnauthorizedException();ResourceResponse response = new ResourceResponse();diff --git a/core/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.java b/core/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.javaindex 286b2d0617..d826fc0206 100644--- a/core/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.java+++ b/core/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.java@@ -46,7 +46,7 @@ public class AttachmentResource extends AbstractResource {if (project == null)throw new EntityNotFoundException("Unable to find project " + projectName);- if (!SecurityUtils.canRead(project))+ if (!SecurityUtils.canReadCode(project.getFacade()))throw new UnauthorizedException();String storage = params.get(PARAM_UUID).toString();diff --git a/core/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.java b/core/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.javaindex 14d0806100..d529a6b72c 100644--- a/core/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.java+++ b/core/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.java@@ -75,7 +75,7 @@ public class RawBlobResource extends AbstractResource {if (StringUtils.isBlank(path))throw new IllegalArgumentException("path parameter has to be specified");- if (!SecurityUtils.canRead(project))+ if (!SecurityUtils.canReadCode(project.getFacade()))throw new UnauthorizedException();final Blob blob = project.getBlob(new BlobIdent(revision, path, 0));diff --git a/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java b/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.javaindex 2850de3e1d..d5f8521c74 100644--- a/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java+++ b/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java@@ -48,11 +48,11 @@ public class TestIssueQueryGrammar {assertEquals(1, suggestions.size());assertEquals("\"Date\" is before \"2018-09-01 2:30PM\":36", suggestions.get(0).toString());- suggestions = codeAssist.suggest(new InputStatus("open", 4), "query");+ suggestions = codeAssist.suggest(new InputStatus("outstanding", 11), "query");assertEquals(3, suggestions.size());- assertEquals("open:4", suggestions.get(0).toString());- assertEquals("\"open\" :7", suggestions.get(1).toString());- assertEquals("open :5", suggestions.get(2).toString());+ assertEquals("outstanding:11", suggestions.get(0).toString());+ assertEquals("\"outstanding\" :14", suggestions.get(1).toString());+ assertEquals("outstanding :12", suggestions.get(2).toString());}}