Skip to content

The Unified and Autonomous Development Platform

Revert to use group concept; Move user management to administration menu;

Robin Shen8456f7347a10
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index c302c796b6..2ff7ee6ec6 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -83,6 +83,7 @@ import io.onedev.server.git.GitPreReceiveCallback;
import io.onedev.server.git.config.GitConfig;
import io.onedev.server.manager.AttachmentManager;
import io.onedev.server.manager.BatchWorkManager;
+import io.onedev.server.manager.BuildInfoManager;
import io.onedev.server.manager.BuildManager;
import io.onedev.server.manager.BuildQuerySettingManager;
import io.onedev.server.manager.CacheManager;
@@ -95,11 +96,11 @@ 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.TeamManager;
+import io.onedev.server.manager.GroupAuthorizationManager;
+import io.onedev.server.manager.GroupManager;
import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueCommentManager;
import io.onedev.server.manager.IssueFieldUnaryManager;
-import io.onedev.server.manager.BuildInfoManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.IssueQuerySettingManager;
import io.onedev.server.manager.IssueVoteManager;
@@ -109,8 +110,8 @@ import io.onedev.server.manager.MarkdownManager;
import io.onedev.server.manager.MembershipManager;
import io.onedev.server.manager.MilestoneManager;
import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.manager.PullRequestChangeManager;
import io.onedev.server.manager.PullRequestBuildManager;
+import io.onedev.server.manager.PullRequestChangeManager;
import io.onedev.server.manager.PullRequestCommentManager;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.manager.PullRequestQuerySettingManager;
@@ -120,16 +121,18 @@ 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;
-import io.onedev.server.manager.impl.DefaultCodeCommentNotificationManager;
import io.onedev.server.manager.impl.DefaultAttachmentManager;
import io.onedev.server.manager.impl.DefaultBatchWorkManager;
+import io.onedev.server.manager.impl.DefaultBuildInfoManager;
import io.onedev.server.manager.impl.DefaultBuildManager;
import io.onedev.server.manager.impl.DefaultBuildQuerySettingManager;
import io.onedev.server.manager.impl.DefaultCacheManager;
import io.onedev.server.manager.impl.DefaultCodeCommentManager;
+import io.onedev.server.manager.impl.DefaultCodeCommentNotificationManager;
import io.onedev.server.manager.impl.DefaultCodeCommentQuerySettingManager;
import io.onedev.server.manager.impl.DefaultCodeCommentRelationInfoManager;
import io.onedev.server.manager.impl.DefaultCodeCommentRelationManager;
@@ -140,11 +143,11 @@ 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.DefaultEntityReferenceManager;
-import io.onedev.server.manager.impl.DefaultTeamManager;
+import io.onedev.server.manager.impl.DefaultGroupAuthorizationManager;
+import io.onedev.server.manager.impl.DefaultGroupManager;
import io.onedev.server.manager.impl.DefaultIssueChangeManager;
import io.onedev.server.manager.impl.DefaultIssueCommentManager;
import io.onedev.server.manager.impl.DefaultIssueFieldUnaryManager;
-import io.onedev.server.manager.impl.DefaultBuildInfoManager;
import io.onedev.server.manager.impl.DefaultIssueManager;
import io.onedev.server.manager.impl.DefaultIssueNotificationManager;
import io.onedev.server.manager.impl.DefaultIssueQuerySettingManager;
@@ -155,8 +158,8 @@ import io.onedev.server.manager.impl.DefaultMarkdownManager;
import io.onedev.server.manager.impl.DefaultMembershipManager;
import io.onedev.server.manager.impl.DefaultMilestoneManager;
import io.onedev.server.manager.impl.DefaultProjectManager;
-import io.onedev.server.manager.impl.DefaultPullRequestChangeManager;
import io.onedev.server.manager.impl.DefaultPullRequestBuildManager;
+import io.onedev.server.manager.impl.DefaultPullRequestChangeManager;
import io.onedev.server.manager.impl.DefaultPullRequestCommentManager;
import io.onedev.server.manager.impl.DefaultPullRequestManager;
import io.onedev.server.manager.impl.DefaultPullRequestNotificationManager;
@@ -166,6 +169,7 @@ 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.DefaultWebHookManager;
@@ -228,8 +232,8 @@ import io.onedev.server.web.editable.DefaultEditSupportRegistry;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EditSupportLocator;
import io.onedev.server.web.editable.EditSupportRegistry;
-import io.onedev.server.web.page.layout.MainNavContribution;
import io.onedev.server.web.page.layout.LayoutPage;
+import io.onedev.server.web.page.layout.MainNavContribution;
import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
import io.onedev.server.web.util.avatar.AvatarManager;
import io.onedev.server.web.util.avatar.DefaultAvatarManager;
@@ -312,7 +316,9 @@ public class CoreModule extends AbstractPluginModule {
bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);
bind(UserInfoManager.class).to(DefaultUserInfoManager.class);
bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);
- bind(TeamManager.class).to(DefaultTeamManager.class);
+ bind(GroupManager.class).to(DefaultGroupManager.class);
+ bind(UserAuthorizationManager.class).to(DefaultUserAuthorizationManager.class);
+ bind(GroupAuthorizationManager.class).to(DefaultGroupAuthorizationManager.class);
bind(MembershipManager.class).to(DefaultMembershipManager.class);
bind(PullRequestChangeManager.class).to(DefaultPullRequestChangeManager.class);
bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);
diff --git a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
index 796686a265..080d454ad3 100644
--- a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
+++ b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
@@ -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.PROJECT_ADMINISTRATION))) {
+ new ProjectPermission(project.getFacade(), ProjectPrivilege.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.java
index db8967aa59..0263b5b0ca 100644
--- a/core/src/main/java/io/onedev/server/manager/CacheManager.java
+++ b/core/src/main/java/io/onedev/server/manager/CacheManager.java
@@ -6,9 +6,11 @@ import java.util.Map;
import javax.annotation.Nullable;
import io.onedev.server.util.facade.ConfigurationFacade;
+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.TeamFacade;
+import io.onedev.server.util.facade.UserAuthorizationFacade;
import io.onedev.server.util.facade.UserFacade;
public interface CacheManager {
@@ -17,7 +19,11 @@ public interface CacheManager {
Map<Long, UserFacade> getUsers();
- Map<Long, TeamFacade> getTeams();
+ Map<Long, GroupFacade> getGroups();
+
+ Map<Long, UserAuthorizationFacade> getUserAuthorizations();
+
+ Map<Long, GroupAuthorizationFacade> getGroupAuthorizations();
Map<Long, MembershipFacade> getMemberships();
@@ -30,7 +36,7 @@ public interface CacheManager {
UserFacade getUser(Long id);
@Nullable
- TeamFacade getTeam(Long id);
+ GroupFacade getGroup(Long id);
@Nullable
MembershipFacade getMembership(Long id);
@@ -41,6 +47,15 @@ public interface CacheManager {
@Nullable
Long getUserIdByEmail(String email);
+ @Nullable
+ UserAuthorizationFacade getUserAuthorization(Long id);
+
+ @Nullable
+ GroupAuthorizationFacade getGroupAuthorization(Long id);
+
+ @Nullable
+ Long getGroupIdByName(String name);
+
Map<String, Long> getProjectIds();
@Nullable
diff --git a/core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.java b/core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.java
new file mode 100644
index 0000000000..b31b0de6dd
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.java
@@ -0,0 +1,12 @@
+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.java
new file mode 100644
index 0000000000..71c8169aee
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/GroupManager.java
@@ -0,0 +1,24 @@
+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.java
index 5d1952d8d7..8d64143192 100644
--- a/core/src/main/java/io/onedev/server/manager/MembershipManager.java
+++ b/core/src/main/java/io/onedev/server/manager/MembershipManager.java
@@ -3,16 +3,10 @@ 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.java
deleted file mode 100644
index 7bd6952a8b..0000000000
--- a/core/src/main/java/io/onedev/server/manager/TeamManager.java
+++ /dev/null
@@ -1,32 +0,0 @@
-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 find(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.java
new file mode 100644
index 0000000000..c1c4fa14a6
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/UserAuthorizationManager.java
@@ -0,0 +1,12 @@
+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 file
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java
index 7c3fdfed54..11ed459c3b 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
@@ -26,21 +26,25 @@ import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Configuration;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Issue;
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.util.facade.BuildFacade;
import io.onedev.server.util.facade.ConfigurationFacade;
import io.onedev.server.util.facade.EntityFacade;
+import io.onedev.server.util.facade.GroupAuthorizationFacade;
+import io.onedev.server.util.facade.GroupFacade;
import io.onedev.server.util.facade.IssueFacade;
import io.onedev.server.util.facade.MembershipFacade;
import io.onedev.server.util.facade.ProjectFacade;
-import io.onedev.server.util.facade.TeamFacade;
+import io.onedev.server.util.facade.UserAuthorizationFacade;
import io.onedev.server.util.facade.UserFacade;
@Singleton
@@ -64,9 +68,11 @@ public class DefaultCacheManager implements CacheManager {
private final ReadWriteLock projectsLock = new ReentrantReadWriteLock();
- private final Map<Long, TeamFacade> teams = new HashMap<>();
+ private final Map<Long, GroupFacade> groups = new HashMap<>();
- private final ReadWriteLock teamsLock = new ReentrantReadWriteLock();
+ private final BiMap<String, Long> groupIdsByName = HashBiMap.create();
+
+ private final ReadWriteLock groupsLock = new ReentrantReadWriteLock();
private final Map<Long, MembershipFacade> memberships = new HashMap<>();
@@ -84,6 +90,14 @@ public class DefaultCacheManager implements CacheManager {
private final ReadWriteLock issuesLock = 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();
+
@Inject
public DefaultCacheManager(Dao dao) {
this.dao = dao;
@@ -104,8 +118,11 @@ public class DefaultCacheManager implements CacheManager {
if (user.getEmail() != null)
userIdsByEmail.inverse().put(user.getId(), user.getEmail());
}
- for (Team team: dao.query(Team.class))
- teams.put(team.getId(), team.getFacade());
+ for (Group group: dao.query(Group.class)) {
+ groups.put(group.getId(), group.getFacade());
+ groupIdsByName.inverse().put(group.getId(), group.getName());
+ }
+
for (Membership membership: dao.query(Membership.class))
memberships.put(membership.getId(), membership.getFacade());
@@ -123,6 +140,11 @@ public class DefaultCacheManager implements CacheManager {
Long issueId = (Long) fields[0];
issues.put(issueId, new IssueFacade(issueId, (Long)fields[1], (Long)fields[2]));
}
+
+ for (GroupAuthorization groupAuthorization: dao.query(GroupAuthorization.class))
+ groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization.getFacade());
+ for (UserAuthorization userAuthorization: dao.query(UserAuthorization.class))
+ userAuthorizations.put(userAuthorization.getId(), userAuthorization.getFacade());
}
@Transactional
@@ -134,8 +156,8 @@ 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 Team) {
- facade = ((Team) event.getEntity()).getFacade();
+ } else if (event.getEntity() instanceof Group) {
+ facade = ((Group) event.getEntity()).getFacade();
} else if (event.getEntity() instanceof Membership) {
facade = ((Membership) event.getEntity()).getFacade();
} else if (event.getEntity() instanceof Build) {
@@ -144,6 +166,10 @@ public class DefaultCacheManager implements CacheManager {
facade = ((Issue)event.getEntity()).getFacade();
} else if (event.getEntity() instanceof Configuration) {
facade = ((Configuration)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;
}
@@ -172,13 +198,14 @@ public class DefaultCacheManager implements CacheManager {
} finally {
usersLock.writeLock().unlock();
}
- } else if (facade instanceof TeamFacade) {
- TeamFacade team = (TeamFacade) facade;
- teamsLock.writeLock().lock();
+ } else if (facade instanceof GroupFacade) {
+ GroupFacade group = (GroupFacade) facade;
+ groupsLock.writeLock().lock();
try {
- teams.put(team.getId(), team);
+ groups.put(group.getId(), group);
+ groupIdsByName.inverse().put(group.getId(), group.getName());
} finally {
- teamsLock.writeLock().unlock();
+ groupsLock.writeLock().unlock();
}
} else if (facade instanceof ConfigurationFacade) {
ConfigurationFacade configuration = (ConfigurationFacade) facade;
@@ -212,7 +239,23 @@ 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();
+ }
+ }
}
});
@@ -237,25 +280,23 @@ public class DefaultCacheManager implements CacheManager {
} finally {
projectsLock.writeLock().unlock();
}
- teamsLock.writeLock().lock();
+ userAuthorizationsLock.writeLock().lock();
try {
- for (Iterator<Map.Entry<Long, TeamFacade>> it = teams.entrySet().iterator(); it.hasNext();) {
- TeamFacade team = it.next().getValue();
- if (team.getProjectId().equals(id)) {
+ for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getValue().getProjectId().equals(id))
+ it.remove();
+ }
+ } 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();
- 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 {
- teamsLock.writeLock().unlock();
+ groupAuthorizationsLock.writeLock().unlock();
}
configurationsLock.writeLock().lock();
try {
@@ -296,6 +337,15 @@ 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();) {
@@ -305,17 +355,27 @@ public class DefaultCacheManager implements CacheManager {
} finally {
membershipsLock.writeLock().unlock();
}
- } else if (Team.class.isAssignableFrom(clazz)) {
- teamsLock.writeLock().lock();
+ } else if (Group.class.isAssignableFrom(clazz)) {
+ groupsLock.writeLock().lock();
try {
- teams.remove(id);
+ groups.remove(id);
+ groupIdsByName.inverse().remove(id);
} finally {
- teamsLock.writeLock().unlock();
+ 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();
}
membershipsLock.writeLock().lock();
try {
for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {
- if (it.next().getValue().getTeamId().equals(id))
+ if (it.next().getValue().getGroupId().equals(id))
it.remove();
}
} finally {
@@ -358,9 +418,22 @@ 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();
+ }
}
}
-
});
}
@@ -384,16 +457,15 @@ public class DefaultCacheManager implements CacheManager {
}
}
- @Override
- public Map<Long, TeamFacade> getTeams() {
- teamsLock.readLock().lock();
+ public Map<Long, GroupFacade> getGroups() {
+ groupsLock.readLock().lock();
try {
- return new HashMap<>(teams);
+ return new HashMap<>(groups);
} finally {
- teamsLock.readLock().unlock();
+ groupsLock.readLock().unlock();
}
}
-
+
@Override
public Map<Long, MembershipFacade> getMemberships() {
membershipsLock.readLock().lock();
@@ -465,12 +537,22 @@ public class DefaultCacheManager implements CacheManager {
}
@Override
- public TeamFacade getTeam(Long id) {
- teamsLock.readLock().lock();
+ public Long getGroupIdByName(String name) {
+ groupsLock.readLock().lock();
try {
- return teams.get(id);
+ return groupIdsByName.get(name);
} finally {
- teamsLock.readLock().unlock();
+ groupsLock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public GroupFacade getGroup(Long id) {
+ groupsLock.readLock().lock();
+ try {
+ return groups.get(id);
+ } finally {
+ groupsLock.readLock().unlock();
}
}
@@ -562,4 +644,44 @@ 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();
+ }
+ }
+
+ @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/DefaultGroupAuthorizationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.java
new file mode 100644
index 0000000000..f87c093254
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.java
@@ -0,0 +1,30 @@
+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/DefaultGroupManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java
new file mode 100644
index 0000000000..39457077df
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java
@@ -0,0 +1,100 @@
+package io.onedev.server.manager.impl;
+
+import java.util.Iterator;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.onedev.server.manager.CacheManager;
+import io.onedev.server.manager.GroupManager;
+import io.onedev.server.manager.IssueFieldUnaryManager;
+import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.BranchProtection;
+import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.model.support.authenticator.Authenticator;
+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;
+
+@Singleton
+public class DefaultGroupManager extends AbstractEntityManager<Group> implements GroupManager {
+
+ 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,
+ 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())) {
+ for (Project project: projectManager.query()) {
+ for (BranchProtection protection: project.getBranchProtections())
+ protection.onRenameGroup(oldName, group.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);
+ }
+
+ issueFieldManager.onRenameGroup(oldName, group.getName());
+ }
+ dao.persist(group);
+ }
+
+ @Transactional
+ @Override
+ public void delete(Group group) {
+ for (Project project: projectManager.query()) {
+ for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
+ if (it.next().onDeleteGroup(group.getName()))
+ it.remove();
+ }
+ for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
+ if (it.next().onDeleteGroup(group.getName()))
+ it.remove();
+ }
+ 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);
+ if (id != null)
+ return load(id);
+ else
+ return null;
+ }
+
+}
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.java
index 14be4a0e3d..3e143c6c64 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
@Override
public 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.TEAM);
+ query.setParameter("groupChoice", InputSpec.GROUP);
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.java
index e5c76ae716..8eff6e1014 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
@@ -21,10 +21,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.IssueChange;
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;
@@ -128,10 +128,10 @@ public class DefaultIssueNotificationManager {
if (event instanceof IssueChangeEvent) {
IssueChange change = ((IssueChangeEvent) event).getChange();
- Map<String, Team> newTeams = change.getData().getNewTeams(issue.getProject());
- if (newTeams != null) {
- for (Team team: newTeams.values()) {
- for (User member: team.getMembers())
+ Map<String, Group> newGroups = change.getData().getNewGroups(issue.getProject());
+ if (newGroups != null) {
+ for (Group group: newGroups.values()) {
+ for (User member: group.getMembers())
watch(issue, member, true);
}
}
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.java
index ac14fb4258..d11cf1a979 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,16 +1,12 @@
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;
@@ -30,78 +26,4 @@ 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.java
index 0635c9b564..3281d64684 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
@@ -39,14 +39,12 @@ 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.TeamManager;
+import io.onedev.server.manager.UserAuthorizationManager;
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;
@@ -55,9 +53,10 @@ import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
+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.TeamFacade;
+import io.onedev.server.util.facade.UserAuthorizationFacade;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.web.util.avatar.AvatarManager;
import io.onedev.utils.ExceptionUtils;
@@ -71,9 +70,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
private final CommitInfoManager commitInfoManager;
- private final TeamManager teamManager;
-
- private final MembershipManager membershipManager;
+ private final UserAuthorizationManager userAuthorizationManager;
private final BuildManager buildManager;
@@ -87,13 +84,12 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
@Inject
public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,
- TeamManager teamManager, MembershipManager membershipManager, BuildManager buildManager,
+ UserAuthorizationManager userAuthorizationManager, BuildManager buildManager,
CacheManager cacheManager, AvatarManager avatarManager) {
super(dao);
this.commitInfoManager = commitInfoManager;
- this.teamManager = teamManager;
- this.membershipManager = membershipManager;
+ this.userAuthorizationManager = userAuthorizationManager;
this.buildManager = buildManager;
this.cacheManager = cacheManager;
this.avatarManager = avatarManager;
@@ -140,18 +136,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
dao.persist(project);
- if (isNew) {
- 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 (isNew) {
+ UserAuthorization authorization = new UserAuthorization();
+ authorization.setPrivilege(ProjectPrivilege.ADMINISTRATION);
+ authorization.setProject(project);
+ authorization.setUser(SecurityUtils.getUser());
+ userAuthorizationManager.save(authorization);
}
-
+
File gitDir = project.getGitDir();
dao.doAfterCommit(new Runnable() {
@@ -294,11 +286,18 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
projects.addAll(cacheManager.getProjects().values());
} else {
if (user != null) {
+ Collection<Long> groupIds = new HashSet<>();
for (MembershipFacade membership: cacheManager.getMemberships().values()) {
- if (membership.getUserId().equals(user.getId())) {
- TeamFacade team = cacheManager.getTeam(membership.getTeamId());
- projects.add(cacheManager.getProject(team.getProjectId()));
- }
+ 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()));
}
}
for (ProjectFacade project: cacheManager.getProjects().values()) {
@@ -325,14 +324,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
public boolean isModificationNeedsQualityCheck(User user, Project project, String branch, @Nullable String file) {
BranchProtection branchProtection = project.getBranchProtection(branch, user);
if (branchProtection != null) {
- if (!ReviewRequirement.parse(project, branchProtection.getReviewRequirement()).satisfied(user))
+ if (!ReviewRequirement.fromString(branchProtection.getReviewRequirement()).satisfied(user))
return true;
if (!branchProtection.getConfigurations().isEmpty())
return true;
if (file != null) {
FileProtection fileProtection = branchProtection.getFileProtection(file);
- if (fileProtection != null && !ReviewRequirement.parse(project, fileProtection.getReviewRequirement()).satisfied(user))
+ if (fileProtection != null && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user))
return true;
}
}
@@ -344,7 +343,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
ObjectId newObjectId, Map<String, String> gitEnvs) {
BranchProtection branchProtection = project.getBranchProtection(branch, user);
if (branchProtection != null) {
- if (!ReviewRequirement.parse(project, branchProtection.getReviewRequirement()).satisfied(user))
+ if (!ReviewRequirement.fromString(branchProtection.getReviewRequirement()).satisfied(user))
return true;
List<Build> builds = buildManager.query(project, newObjectId.name());
@@ -355,7 +354,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
for (String changedFile: getChangedFiles(project, oldObjectId, newObjectId, gitEnvs)) {
FileProtection fileProtection = branchProtection.getFileProtection(changedFile);
- if (fileProtection != null && !ReviewRequirement.parse(project, fileProtection.getReviewRequirement()).satisfied(user))
+ if (fileProtection != null && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(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.java
index 8ae7bc12f2..b178225f30 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
@@ -80,13 +80,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.PullRequestBuild;
import io.onedev.server.model.PullRequestChange;
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;
@@ -675,7 +675,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
public void checkQuality(PullRequest request) {
BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());
if (branchProtection != null) {
- checkReviews(ReviewRequirement.parse(request.getTargetProject(), branchProtection.getReviewRequirement()), request.getLatestUpdate());
+ checkReviews(ReviewRequirement.fromString(branchProtection.getReviewRequirement()), request.getLatestUpdate());
if (branchProtection.getConfigurations() != null)
checkBuilds(request, branchProtection.getConfigurations(), branchProtection.isBuildMerges());
@@ -689,7 +689,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
FileProtection fileProtection = branchProtection.getFileProtection(file);
if (fileProtection != null && !checkedFileProtections.contains(fileProtection)) {
checkedFileProtections.add(fileProtection);
- checkReviews(ReviewRequirement.parse(request.getTargetProject(), fileProtection.getReviewRequirement()), update);
+ checkReviews(ReviewRequirement.fromString(fileProtection.getReviewRequirement()), update);
}
}
}
@@ -767,10 +767,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
}
- for (Map.Entry<Team, Integer> entry: reviewRequirement.getTeams().entrySet()) {
- Team team = entry.getKey();
+ for (Map.Entry<Group, Integer> entry: reviewRequirement.getGroups().entrySet()) {
+ Group group = entry.getKey();
int requiredCount = entry.getValue();
- checkReviews(team.getMembers(), requiredCount, update);
+ checkReviews(group.getMembers(), requiredCount, update);
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultTeamManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultTeamManager.java
deleted file mode 100644
index fa88eb5ffe..0000000000
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultTeamManager.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.onedev.server.manager.impl;
-
-import java.util.Iterator;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.manager.IssueFieldUnaryManager;
-import io.onedev.server.manager.ProjectManager;
-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.persistence.dao.EntityCriteria;
-import io.onedev.utils.StringUtils;
-
-@Singleton
-public class DefaultTeamManager extends AbstractEntityManager<Team> implements TeamManager {
-
- private final ProjectManager projectManager;
-
- private final IssueFieldUnaryManager issueFieldManager;
-
- @Inject
- public DefaultTeamManager(Dao dao, ProjectManager projectManager, IssueFieldUnaryManager issueFieldManager) {
- super(dao);
- this.projectManager = projectManager;
- this.issueFieldManager = issueFieldManager;
- }
-
- @Transactional
- @Override
- public void save(Team team, String oldName) {
- if (oldName != null && !oldName.equals(team.getName())) {
- for (Project project: projectManager.query()) {
- for (BranchProtection protection: project.getBranchProtections())
- protection.onRenameTeam(project, oldName, team.getName());
- for (TagProtection protection: project.getTagProtections())
- protection.onRenameGroup(oldName, team.getName());
- project.getIssueWorkflow().onRenameGroup(oldName, team.getName());
- }
-
- issueFieldManager.onRenameGroup(oldName, team.getName());
- }
- dao.persist(team);
- }
-
- @Transactional
- @Override
- public void delete(Team group) {
- for (Project project: projectManager.query()) {
- for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
- if (it.next().onDeleteTeam(project, group.getName()))
- it.remove();
- }
- for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
- if (it.next().onDeleteGroup(group.getName()))
- it.remove();
- }
- project.getIssueWorkflow().onDeleteGroup(group.getName());
- }
-
- dao.remove(group);
- }
-
- @Sessional
- @Override
- public Team find(Project project, String name) {
- EntityCriteria<Team> criteria = newCriteria();
- criteria.add(Restrictions.eq("project", project));
- criteria.add(Restrictions.eq("name", name));
- return find(criteria);
- }
-
- @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 find(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.java
new file mode 100644
index 0000000000..f3d229f8f3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserAuthorizationManager.java
@@ -0,0 +1,30 @@
+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/migration/DatabaseMigrator.java b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
index dffc41b798..c1fe534c79 100644
--- a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
+++ b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
@@ -2,6 +2,7 @@ package io.onedev.server.migration;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -502,10 +503,6 @@ public class DatabaseMigrator {
Map<String, Integer> requestCommentCounts = new HashMap<>();
Set<String> openRequests = new HashSet<>();
Map<String, String> reviewRequirements = new HashMap<>();
- Map<String, String[]> groups= new HashMap<>();
- Map<String, String[]> groupMemberships = new HashMap<>();
- Map<String, String[]> userAuthorizations = new HashMap<>();
- Map<String, String[]> groupAuthorizations = new HashMap<>();
for (File file: dataDir.listFiles()) {
if (file.getName().startsWith("Users.xml")) {
@@ -556,43 +553,6 @@ public class DatabaseMigrator {
openRequests.add(element.elementTextTrim("id"));
}
}
- } else if (file.getName().startsWith("Groups.xml")) {
- VersionedDocument dom = VersionedDocument.fromFile(file);
- for (Element element: dom.getRootElement().elements()) {
- String id = element.elementTextTrim("id");
- groups.put(id, new String[] {
- element.elementTextTrim("name"),
- element.elementTextTrim("administrator"),
- element.elementTextTrim("canCreateProjects")});
- }
- } else if (file.getName().startsWith("GroupAuthorizations.xml")) {
- VersionedDocument dom = VersionedDocument.fromFile(file);
- for (Element element: dom.getRootElement().elements()) {
- String id = element.elementTextTrim("id");
- groupAuthorizations.put(id, new String[] {
- element.elementTextTrim("project"),
- element.elementTextTrim("group"),
- element.elementTextTrim("privilege")});
- }
- } else if (file.getName().startsWith("UserAuthorizations.xml")) {
- VersionedDocument dom = VersionedDocument.fromFile(file);
- for (Element element: dom.getRootElement().elements()) {
- String id = element.elementTextTrim("id");
- userAuthorizations.put(id, new String[] {
- element.elementTextTrim("project"),
- element.elementTextTrim("user"),
- element.elementTextTrim("privilege")
- });
- }
- } else if (file.getName().startsWith("Memberships.xml")) {
- VersionedDocument dom = VersionedDocument.fromFile(file);
- for (Element element: dom.getRootElement().elements()) {
- String id = element.elementTextTrim("id");
- groupMemberships.put(id, new String[] {
- element.elementTextTrim("group"),
- element.elementTextTrim("user")
- });
- }
} else if (file.getName().startsWith("Projects.xml")) {
VersionedDocument dom = VersionedDocument.fromFile(file);
for (Element element: dom.getRootElement().elements()) {
@@ -640,147 +600,24 @@ public class DatabaseMigrator {
Element requestBuildListElement = requestBuildsDOM.addElement("list");
int requestBuildCount = 0;
- VersionedDocument teamsDOM = new VersionedDocument();
- Element teamListElement = teamsDOM.addElement("list");
- int teamCount = 0;
-
- VersionedDocument membershipsDOM = new VersionedDocument();
- Element membershipListElement = membershipsDOM.addElement("list");
- int membershipCount = 0;
-
- Map<String, String[]> teams = new HashMap<>();
- Map<String, String[]> teamMemberships = new HashMap<>();
-
- for (Map.Entry<String, String[]> groupEntry: groups.entrySet()) {
- String groupId = groupEntry.getKey();
- String groupName = groupEntry.getValue()[0];
- for (Map.Entry<String, String> reviewRequirementEntry: reviewRequirements.entrySet()) {
- String projectId = reviewRequirementEntry.getKey();
- String privilege = null;
- for (Map.Entry<String, String[]> groupAuthorizationEntry: groupAuthorizations.entrySet()) {
- if (groupAuthorizationEntry.getValue()[0].equals(projectId)
- && groupAuthorizationEntry.getValue()[1].equals(groupId)) {
- privilege = groupAuthorizationEntry.getValue()[2];
- break;
- }
- }
- if (privilege == null && reviewRequirementEntry.getValue().contains("group(" + groupName + ")"))
- privilege = "READ";
- if (privilege != null) {
- String teamId = String.valueOf(++teamCount);
- Element teamElement = teamListElement.addElement("io.onedev.server.model.Team");
- teamElement.addAttribute("revision", "0.0");
- teamElement.addElement("id").setText(teamId);
- teamElement.addElement("project").setText(projectId);
- teamElement.addElement("name").setText(groupName);
- if (privilege.equals("READ"))
- teamElement.addElement("privilege").setText("CODE_READ");
- else if (privilege.equals("WRITE"))
- teamElement.addElement("privilege").setText("CODE_WRITE");
- else
- teamElement.addElement("privilege").setText("PROJECT_ADMINISTRATION");
-
- teams.put(String.valueOf(teamId), new String[] {projectId, groupName});
-
- for (Map.Entry<String, String[]> membershipEntry: groupMemberships.entrySet()) {
- if (membershipEntry.getValue()[0].equals(groupId)) {
- String userId = membershipEntry.getValue()[1];
- Element membershipElement = membershipListElement.addElement("io.onedev.server.model.Membership");
- String membershipId = String.valueOf(++membershipCount);
- membershipElement.addAttribute("revision", "0.0");
- membershipElement.addElement("id").setText(membershipId);
- membershipElement.addElement("team").setText(teamId);
- membershipElement.addElement("user").setText(userId);
- teamMemberships.put(membershipId, new String[] {teamId, userId});
- }
- }
- }
- }
- }
-
- for (Map.Entry<String, String[]> userAuthorizationEntry: userAuthorizations.entrySet()) {
- String projectId = userAuthorizationEntry.getValue()[0];
- String userId = userAuthorizationEntry.getValue()[1];
- String privilege = userAuthorizationEntry.getValue()[2];
- String teamName;
- if (privilege.equals("READ"))
- teamName = "Code readers";
- else if (privilege.equals("WRITE"))
- teamName = "Code writers";
- else
- teamName = "Project administrators";
- String teamId = null;
- for (Map.Entry<String, String[]> teamEntry: teams.entrySet()) {
- if (teamEntry.getValue()[0].equals(projectId) && teamEntry.getValue()[1].equals(teamName)) {
- teamId = teamEntry.getKey();
- break;
- }
- }
- if (teamId == null) {
- teamId = String.valueOf(++teamCount);
- Element teamElement = teamListElement.addElement("io.onedev.server.model.Team");
- teamElement.addAttribute("revision", "0.0");
- teamElement.addElement("id").setText(teamId);
- teamElement.addElement("project").setText(projectId);
- teamElement.addElement("name").setText(teamName);
- if (privilege.equals("READ"))
- teamElement.addElement("privilege").setText("CODE_READ");
- else if (privilege.equals("WRITE"))
- teamElement.addElement("privilege").setText("CODE_WRITE");
- else
- teamElement.addElement("privilege").setText("PROJECT_ADMINISTRATION");
- teams.put(teamId, new String[] {projectId, teamName});
- }
-
- boolean found = false;
- for (Map.Entry<String, String[]> membershipEntry: teamMemberships.entrySet()) {
- if (membershipEntry.getValue()[0].equals(teamId) && membershipEntry.getValue()[1].equals(userId)) {
- found = true;
- break;
- }
- }
- if (!found) {
- Element membershipElement = membershipListElement.addElement("io.onedev.server.model.Membership");
- membershipElement.addAttribute("revision", "0.0");
- String membershipId = String.valueOf(++membershipCount);
- membershipElement.addElement("id").setText(membershipId);
- membershipElement.addElement("team").setText(teamId);
- membershipElement.addElement("user").setText(userId);
- teamMemberships.put(membershipId, new String[] {teamId, userId});
- }
- }
-
for (File file: dataDir.listFiles()) {
if (file.getName().startsWith("BranchWatches.xml")
|| file.getName().startsWith("PullRequestReferences.xml")
|| file.getName().startsWith("PullRequestStatusChanges.xml")
|| file.getName().startsWith("PullRequestTasks.xml")
|| file.getName().startsWith("ReviewInvitations.xml")
- || file.getName().startsWith("Reviews.xml")
- || file.getName().startsWith("Groups.xml")
- || file.getName().startsWith("GroupAuthorizations.xml")
- || file.getName().startsWith("UserAuthorizations.xml")
- || file.getName().startsWith("Memberships.xml")) {
+ || file.getName().startsWith("Reviews.xml")) {
FileUtils.deleteFile(file);
- } else if (file.getName().startsWith("Users.xml")) {
- VersionedDocument dom = VersionedDocument.fromFile(file);
- for (Element element: dom.getRootElement().elements()) {
- String userId = element.elementTextTrim("id");
- boolean canCreateProjects = false;
- boolean administrator = false;
- for (Map.Entry<String, String[]> entry: groupMemberships.entrySet()) {
- if (entry.getValue()[1].equals(userId)) {
- String groupId = entry.getValue()[0];
- if (groups.get(groupId)[1].equals("true"))
- administrator = true;
- if (groups.get(groupId)[2].equals("true"))
- canCreateProjects = true;
- }
- }
- element.addElement("administrator").setText(String.valueOf(administrator));
- element.addElement("canCreateProjects").setText(String.valueOf(canCreateProjects));
+ } else if (file.getName().startsWith("UserAuthorizations.xml") || file.getName().startsWith("GroupAuthorizations.xml")) {
+ try {
+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8.name());
+ content = StringUtils.replace(content, "ADMIN", "ADMINISTRATION");
+ content = StringUtils.replace(content, "WRITE", "CODE_WRITE");
+ content = StringUtils.replace(content, "READ", "CODE_READ");
+ FileUtils.writeFile(file, content, StandardCharsets.UTF_8.name());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
- dom.writeToFile(file, false);
} else if (file.getName().startsWith("CodeComments.xml")) {
VersionedDocument dom = VersionedDocument.fromFile(file);
for (Element element: dom.getRootElement().elements()) {
@@ -974,7 +811,5 @@ public class DatabaseMigrator {
requestReviewsDOM.writeToFile(new File(dataDir, "PullRequestReviews.xml"), false);
configurationsDOM.writeToFile(new File(dataDir, "Configurations.xml"), false);
requestBuildsDOM.writeToFile(new File(dataDir, "PullRequestBuilds.xml"), false);
- teamsDOM.writeToFile(new File(dataDir, "Teams.xml"), false);
- membershipsDOM.writeToFile(new File(dataDir, "Memberships.xml"), false);
}
}
diff --git a/core/src/main/java/io/onedev/server/model/Team.java b/core/src/main/java/io/onedev/server/model/Group.java
similarity index 50%
rename from core/src/main/java/io/onedev/server/model/Team.java
rename to core/src/main/java/io/onedev/server/model/Group.java
index d6f13d3f19..f9c9305dc1 100644
--- a/core/src/main/java/io/onedev/server/model/Team.java
+++ b/core/src/main/java/io/onedev/server/model/Group.java
@@ -7,57 +7,39 @@ 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.security.permission.ProjectPrivilege;
-import io.onedev.server.util.facade.TeamFacade;
+import io.onedev.server.util.facade.GroupFacade;
import io.onedev.server.web.editable.annotation.Editable;
@Entity
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
-@Table(
- indexes={@Index(columnList="o_project_id"), @Index(columnList="name")},
- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "name"})})
-public class Team extends AbstractEntity {
+public class Group extends AbstractEntity {
private static final long serialVersionUID = 1L;
- public static final String FQN_SEPARATOR = ":";
+ @Column(unique=true, nullable=false)
+ private String name;
- @ManyToOne(fetch=FetchType.LAZY)
- @JoinColumn(nullable=false)
- private Project project;
+ private String description;
- @Column(nullable=false)
- private String name;
+ private boolean administrator;
- private ProjectPrivilege privilege;
+ private boolean canCreateProjects = true;
+
+ @OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)
+ private Collection<GroupAuthorization> authorizations = new ArrayList<>();
- @OneToMany(mappedBy="team", cascade=CascadeType.REMOVE)
+ @OneToMany(mappedBy="group", 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)
@NotEmpty
public String getName() {
@@ -68,14 +50,39 @@ public class Team 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)
- @NotNull
- public ProjectPrivilege getPrivilege() {
- return privilege;
+ public boolean isAdministrator() {
+ return administrator;
}
- public void setPrivilege(ProjectPrivilege privilege) {
- this.privilege = 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 Collection<Membership> getMemberships() {
@@ -98,16 +105,12 @@ public class Team extends AbstractEntity {
@Override
public int compareTo(AbstractEntity entity) {
- Team team = (Team) entity;
- return getName().compareTo(team.getName());
+ Group group = (Group) entity;
+ return getName().compareTo(group.getName());
}
- public TeamFacade getFacade() {
- return new TeamFacade(this);
- }
-
- public String getFQN() {
- return getProject().getName() + FQN_SEPARATOR + getName();
+ public GroupFacade getFacade() {
+ return new GroupFacade(this);
}
}
diff --git a/core/src/main/java/io/onedev/server/model/GroupAuthorization.java b/core/src/main/java/io/onedev/server/model/GroupAuthorization.java
new file mode 100644
index 0000000000..16b501da2f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/GroupAuthorization.java
@@ -0,0 +1,63 @@
+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.permission.ProjectPrivilege;
+import io.onedev.server.util.facade.GroupAuthorizationFacade;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_group_id"), @Index(columnList="o_project_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_group_id", "o_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.CODE_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/Membership.java b/core/src/main/java/io/onedev/server/model/Membership.java
index 054a299782..9189332f66 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="o_user_id"), @Index(columnList="o_team_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_team_id"})
+ indexes={@Index(columnList="o_user_id"), @Index(columnList="o_group_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_group_id"})
})
public class Membership extends AbstractEntity {
@@ -25,7 +25,7 @@ public class Membership extends AbstractEntity {
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
- private Team team;
+ private Group group;
public User getUser() {
return user;
@@ -35,12 +35,12 @@ public class Membership extends AbstractEntity {
this.user = user;
}
- public Team getTeam() {
- return team;
+ public Group getGroup() {
+ return group;
}
- public void setTeam(Team team) {
- this.team = team;
+ public void setGroup(Group group) {
+ this.group = group;
}
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.java
index c95659b94a..d6d7e6b8cd 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -179,12 +179,15 @@ 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<>();
@@ -299,6 +302,7 @@ public class Project extends AbstractEntity {
@Editable(order=300, description="Optionally specify default privilege for users not "
+ "joining any teams of the project")
@NameOfEmptyValue("No default privilege")
+ @Nullable
public DefaultPrivilege getDefaultPrivilege() {
return defaultPrivilege;
}
@@ -365,12 +369,20 @@ public class Project extends AbstractEntity {
this.outgoingRequests = outgoingRequests;
}
- public Collection<Team> getTeams() {
- return teams;
+ public Collection<GroupAuthorization> getGroupAuthorizations() {
+ return groupAuthorizations;
+ }
+
+ public void setGroupAuthorizations(Collection<GroupAuthorization> groupAuthorizations) {
+ this.groupAuthorizations = groupAuthorizations;
+ }
+
+ public Collection<UserAuthorization> getUserAuthorizations() {
+ return userAuthorizations;
}
- public void setTeams(Collection<Team> teams) {
- this.teams = teams;
+ public void setAuthorizedUsers(Collection<UserAuthorization> userAuthorizations) {
+ this.userAuthorizations = userAuthorizations;
}
public Project getForkedFrom() {
diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.java
index 3cdae248f8..df914a731f 100644
--- a/core/src/main/java/io/onedev/server/model/User.java
+++ b/core/src/main/java/io/onedev/server/model/User.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.UUID;
-import javax.annotation.Nullable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -49,19 +48,15 @@ public class User extends AbstractEntity implements AuthenticationInfo {
@Column(unique=true, nullable=false)
private String name;
- @Column(length=1024)
+ @Column(length=1024, nullable=false)
@JsonView(DefaultView.class)
private String password;
private String fullName;
- @Column(unique=true)
+ @Column(unique=true, nullable=false)
private String email;
- private boolean administrator;
-
- private boolean canCreateProjects = true;
-
@Column(nullable=false)
private String uuid = UUID.randomUUID().toString();
@@ -164,24 +159,6 @@ 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;
}
@@ -242,14 +219,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {
}
}
- public static User getForDisplay(@Nullable User user, @Nullable String userName) {
- if (user == null && userName != null) {
- user = new User();
- user.setName(userName);
- }
- return user;
- }
-
public UserFacade getFacade() {
return new UserFacade(this);
}
diff --git a/core/src/main/java/io/onedev/server/model/UserAuthorization.java b/core/src/main/java/io/onedev/server/model/UserAuthorization.java
new file mode 100644
index 0000000000..67003b188d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/UserAuthorization.java
@@ -0,0 +1,63 @@
+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.permission.ProjectPrivilege;
+import io.onedev.server.util.facade.UserAuthorizationFacade;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_user_id"), @Index(columnList="o_project_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_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.CODE_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.java
index c20c461f21..47a873ff7d 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
@@ -10,11 +10,11 @@ import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotEmpty;
+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.usermatcher.Anyone;
-import io.onedev.server.model.support.usermatcher.SpecifiedTeam;
+import io.onedev.server.model.support.usermatcher.SpecifiedGroup;
import io.onedev.server.model.support.usermatcher.SpecifiedUser;
import io.onedev.server.model.support.usermatcher.UserMatcher;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
@@ -160,46 +160,46 @@ public class BranchProtection implements Serializable {
return null;
}
- 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);
+ public void onRenameGroup(String oldName, String newName) {
+ if (getSubmitter() instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();
+ if (specifiedGroup.getGroupName().equals(oldName))
+ specifiedGroup.setGroupName(newName);
}
- ReviewRequirement reviewRequirement = ReviewRequirement.parse(project, this.reviewRequirement);
- for (Team team: reviewRequirement.getTeams().keySet()) {
- if (team.getName().equals(oldName))
- team.setName(newName);
+ ReviewRequirement reviewRequirement = ReviewRequirement.fromString(this.reviewRequirement);
+ for (Group group: reviewRequirement.getGroups().keySet()) {
+ if (group.getName().equals(oldName))
+ group.setName(newName);
}
setReviewRequirement(reviewRequirement.toString());
for (FileProtection fileProtection: getFileProtections()) {
- reviewRequirement = ReviewRequirement.parse(project, fileProtection.getReviewRequirement());
- for (Team team: reviewRequirement.getTeams().keySet()) {
- if (team.getName().equals(oldName))
- team.setName(newName);
+ reviewRequirement = ReviewRequirement.fromString(fileProtection.getReviewRequirement());
+ for (Group group: reviewRequirement.getGroups().keySet()) {
+ if (group.getName().equals(oldName))
+ group.setName(newName);
}
fileProtection.setReviewRequirement(reviewRequirement.toString());
}
}
- public boolean onDeleteTeam(Project project, String teamName) {
- if (getSubmitter() instanceof SpecifiedTeam) {
- SpecifiedTeam specifiedTeam = (SpecifiedTeam) getSubmitter();
- if (specifiedTeam.getTeamName().equals(teamName))
+ public boolean onDeleteGroup(String groupName) {
+ if (getSubmitter() instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();
+ if (specifiedGroup.getGroupName().equals(groupName))
return true;
}
- for (Team team: ReviewRequirement.parse(project, this.reviewRequirement).getTeams().keySet()) {
- if (team.getName().equals(teamName))
+ for (Group group: ReviewRequirement.fromString(reviewRequirement).getGroups().keySet()) {
+ if (group.getName().equals(groupName))
return true;
}
for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {
FileProtection protection = it.next();
- for (Team team: ReviewRequirement.parse(project, protection.getReviewRequirement()).getTeams().keySet()) {
- if (team.getName().equals(teamName)) {
+ for (Group group: ReviewRequirement.fromString(protection.getReviewRequirement()).getGroups().keySet()) {
+ if (group.getName().equals(groupName)) {
it.remove();
break;
}
@@ -226,7 +226,7 @@ public class BranchProtection implements Serializable {
specifiedUser.setUserName(newName);
}
- ReviewRequirement reviewRequirement = ReviewRequirement.parse(project, this.reviewRequirement);
+ ReviewRequirement reviewRequirement = ReviewRequirement.fromString(this.reviewRequirement);
for (User user: reviewRequirement.getUsers()) {
if (user.getName().equals(oldName))
user.setName(newName);
@@ -234,7 +234,7 @@ public class BranchProtection implements Serializable {
setReviewRequirement(reviewRequirement.toString());
for (FileProtection fileProtection: getFileProtections()) {
- reviewRequirement = ReviewRequirement.parse(project, fileProtection.getReviewRequirement());
+ reviewRequirement = ReviewRequirement.fromString(fileProtection.getReviewRequirement());
for (User user: reviewRequirement.getUsers()) {
if (user.getName().equals(oldName))
user.setName(newName);
@@ -250,14 +250,14 @@ public class BranchProtection implements Serializable {
return true;
}
- for (User user: ReviewRequirement.parse(project, this.reviewRequirement).getUsers()) {
+ for (User user: ReviewRequirement.fromString(reviewRequirement).getUsers()) {
if (user.getName().equals(userName))
return true;
}
for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {
FileProtection protection = it.next();
- for (User user: ReviewRequirement.parse(project, protection.getReviewRequirement()).getUsers()) {
+ for (User user: ReviewRequirement.fromString(protection.getReviewRequirement()).getUsers()) {
if (user.getName().equals(userName)) {
it.remove();
break;
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.java
index 69ca84f2fb..c35bb13b38 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
@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.model.support.usermatcher.Anyone;
-import io.onedev.server.model.support.usermatcher.SpecifiedTeam;
+import io.onedev.server.model.support.usermatcher.SpecifiedGroup;
import io.onedev.server.model.support.usermatcher.SpecifiedUser;
import io.onedev.server.model.support.usermatcher.UserMatcher;
import io.onedev.server.web.editable.annotation.Editable;
@@ -88,17 +88,17 @@ public class TagProtection implements Serializable {
}
public void onRenameGroup(String oldName, String newName) {
- if (getSubmitter() instanceof SpecifiedTeam) {
- SpecifiedTeam specifiedGroup = (SpecifiedTeam) getSubmitter();
- if (specifiedGroup.getTeamName().equals(oldName))
- specifiedGroup.setTeamName(newName);
+ if (getSubmitter() instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();
+ if (specifiedGroup.getGroupName().equals(oldName))
+ specifiedGroup.setGroupName(newName);
}
}
public boolean onDeleteGroup(String groupName) {
- if (getSubmitter() instanceof SpecifiedTeam) {
- SpecifiedTeam specifiedGroup = (SpecifiedTeam) getSubmitter();
- if (specifiedGroup.getTeamName().equals(groupName))
+ if (getSubmitter() instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();
+ if (specifiedGroup.getGroupName().equals(groupName))
return true;
}
return false;
diff --git a/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticated.java b/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticated.java
index f254701387..0e3b9566e6 100644
--- a/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticated.java
+++ b/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticated.java
@@ -10,12 +10,12 @@ public class Authenticated {
private final String email;
- private final Collection<String> teamFQNs;
+ private final Collection<String> groupNames;
- public Authenticated(@Nullable String fullName, @Nullable String email, Collection<String> teamFQNs) {
+ public Authenticated(@Nullable String fullName, @Nullable String email, Collection<String> groupNames) {
this.fullName = fullName;
this.email = email;
- this.teamFQNs = teamFQNs;
+ this.groupNames = groupNames;
}
@Nullable
@@ -28,8 +28,8 @@ public class Authenticated {
return email;
}
- public Collection<String> getTeamFQNs() {
- return teamFQNs;
+ public Collection<String> getGroupNames() {
+ return groupNames;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.java b/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.java
index 464352a6fb..ebf1f1b26a 100644
--- a/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.java
+++ b/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.java
@@ -1,21 +1,23 @@
package io.onedev.server.model.support.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;
@Editable
public abstract class Authenticator implements Serializable {
private static final long serialVersionUID = 1L;
- private int timeout = 300;
-
- private boolean canCreateProjects;
+ private List<String> defaultGroupNames;
+ private int timeout = 300;
+
@Editable(order=10000, description="Specify network timeout in seconds when authenticate through this system")
public int getTimeout() {
return timeout;
@@ -25,15 +27,27 @@ public abstract class Authenticator implements Serializable {
this.timeout = timeout;
}
- @Editable(order=20000, description="Check this if authenticated users are allowed to create projects")
- public boolean isCanCreateProjects() {
- return canCreateProjects;
+ @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;
}
- public void setCanCreateProjects(boolean canCreateProjects) {
- this.canCreateProjects = canCreateProjects;
+ public void setDefaultGroupNames(List<String> defaultGroupNames) {
+ this.defaultGroupNames = defaultGroupNames;
}
+ 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/model/support/issue/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java
index 14256578bc..cb0bd86417 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
@@ -25,7 +25,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.teamchoiceinput.TeamChoiceInput;
+import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
@@ -124,7 +124,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 TeamChoiceInput))
+ if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceInput || fieldSpec instanceof UserChoiceInput || fieldSpec instanceof GroupChoiceInput))
choices.add(fieldSpec.getName());
}
return choices;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
index 49eae59ef0..d658a3d3a7 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
@@ -7,9 +7,9 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
-import io.onedev.server.model.Team;
import io.onedev.server.model.User;
import io.onedev.server.util.CommentSupport;
@@ -26,6 +26,6 @@ public interface IssueChangeData extends Serializable {
Map<String, User> getNewUsers(Project project);
@Nullable
- Map<String, Team> getNewTeams(Project project);
+ Map<String, Group> getNewGroups(Project project);
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
index db5768bce0..5f6dfd89a6 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
@@ -5,9 +5,9 @@ import java.util.Map;
import org.apache.wicket.Component;
+import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
-import io.onedev.server.model.Team;
import io.onedev.server.model.User;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
@@ -49,7 +49,7 @@ public class IssueDescriptionChangeData implements IssueChangeData {
}
@Override
- public Map<String, Team> getNewTeams(Project project) {
+ public Map<String, Group> getNewGroups(Project project) {
return null;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
index a23acc3a74..43b056d0f6 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
@@ -9,11 +9,11 @@ import java.util.Map;
import org.apache.wicket.Component;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.TeamManager;
+import io.onedev.server.manager.GroupManager;
import io.onedev.server.manager.UserManager;
+import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
-import io.onedev.server.model.Team;
import io.onedev.server.model.User;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.util.IssueField;
@@ -84,24 +84,24 @@ public class IssueFieldChangeData implements IssueChangeData {
return newUsers;
}
- protected Map<String, String> getNewTeams() {
- Map<String, String> newTeams = new HashMap<>();
+ protected Map<String, String> getNewGroups() {
+ Map<String, String> newGroups = new HashMap<>();
for (IssueField oldField: oldFields.values()) {
IssueField newField = newFields.get(oldField.getName());
if (newField != null
&& !describe(oldField).equals(describe(newField))
- && newField.getType().equals(InputSpec.TEAM)
+ && newField.getType().equals(InputSpec.GROUP)
&& !newField.getValues().isEmpty())
- newTeams.put(newField.getName(), newField.getValues().iterator().next());
+ newGroups.put(newField.getName(), newField.getValues().iterator().next());
}
for (IssueField newField: newFields.values()) {
if (!oldFields.containsKey(newField.getName())
- && newField.getType().equals(InputSpec.TEAM)
+ && newField.getType().equals(InputSpec.GROUP)
&& !newField.getValues().isEmpty()) {
- newTeams.put(newField.getName(), newField.getValues().iterator().next());
+ newGroups.put(newField.getName(), newField.getValues().iterator().next());
}
}
- return newTeams;
+ return newGroups;
}
private Map<String, IssueField> copyNonEmptyFields(Map<String, IssueField> fields) {
@@ -151,14 +151,14 @@ public class IssueFieldChangeData implements IssueChangeData {
}
@Override
- public Map<String, Team> getNewTeams(Project project) {
- Map<String, Team> newTeams = new HashMap<>();
- for (Map.Entry<String, String> entry: getNewTeams().entrySet()) {
- Team team = OneDev.getInstance(TeamManager.class).find(project, entry.getValue());
- if (team != null)
- newTeams.put(entry.getKey(), team);
+ public Map<String, Group> getNewGroups(Project project) {
+ Map<String, Group> newGroups = new HashMap<>();
+ for (Map.Entry<String, String> entry: getNewGroups().entrySet()) {
+ Group group = OneDev.getInstance(GroupManager.class).find(entry.getValue());
+ if (group != null)
+ newGroups.put(entry.getKey(), group);
}
- return newTeams;
+ return newGroups;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java
index f0f9d95a13..e1a3ac49d7 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java
@@ -8,10 +8,10 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
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.util.CommentSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
@@ -76,7 +76,7 @@ public class IssueMilestoneChangeData implements IssueChangeData {
}
@Override
- public Map<String, Team> getNewTeams(Project project) {
+ public Map<String, Group> getNewGroups(Project project) {
return null;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
index d41ffbf205..838ea2001b 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
@@ -5,9 +5,9 @@ import java.util.Map;
import org.apache.wicket.Component;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
-import io.onedev.server.model.Team;
import io.onedev.server.model.User;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;
@@ -47,7 +47,7 @@ public class IssueReferencedFromCodeCommentData implements IssueChangeData {
}
@Override
- public Map<String, Team> getNewTeams(Project project) {
+ public Map<String, Group> getNewGroups(Project project) {
return null;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
index deb45edd05..a58c9b62bd 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
@@ -4,10 +4,10 @@ import java.util.Map;
import org.apache.wicket.Component;
+import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
-import io.onedev.server.model.Team;
import io.onedev.server.model.User;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;
@@ -47,7 +47,7 @@ public class IssueReferencedFromIssueData implements IssueChangeData {
}
@Override
- public Map<String, Team> getNewTeams(Project project) {
+ public Map<String, Group> getNewGroups(Project project) {
return null;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
index 68d07a88c3..b23f988dfa 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
@@ -4,10 +4,10 @@ import java.util.Map;
import org.apache.wicket.Component;
+import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.Team;
import io.onedev.server.model.User;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.pullrequest.referencedfrom.ReferencedFromPullRequestPanel;
@@ -47,7 +47,7 @@ public class IssueReferencedFromPullRequestData implements IssueChangeData {
}
@Override
- public Map<String, Team> getNewTeams(Project project) {
+ public Map<String, Group> getNewGroups(Project project) {
return null;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java
index 59414b1163..7bb4d2d503 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java
@@ -4,9 +4,9 @@ import java.util.Map;
import org.apache.wicket.Component;
+import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
-import io.onedev.server.model.Team;
import io.onedev.server.model.User;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
@@ -46,7 +46,7 @@ public class IssueTitleChangeData implements IssueChangeData {
}
@Override
- public Map<String, Team> getNewTeams(Project project) {
+ public Map<String, Group> getNewGroups(Project project) {
return null;
}
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.java
index 38a2b93971..17d3454a2f 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
@@ -15,7 +15,7 @@ import io.onedev.server.model.support.issue.workflow.transitionprerequisite.Tran
import io.onedev.server.model.support.issue.workflow.transitiontrigger.BuildSuccessfulTrigger;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.TransitionTrigger;
-import io.onedev.server.model.support.usermatcher.SpecifiedTeam;
+import io.onedev.server.model.support.usermatcher.SpecifiedGroup;
import io.onedev.server.model.support.usermatcher.SpecifiedUser;
import io.onedev.server.util.IssueField;
import io.onedev.server.util.inputspec.InputSpec;
@@ -166,10 +166,10 @@ public class TransitionSpec implements Serializable {
TransitionTrigger trigger = getTrigger();
if (trigger instanceof PressButtonTrigger) {
PressButtonTrigger pressButton = (PressButtonTrigger) trigger;
- if (pressButton.getAuthorized() instanceof SpecifiedTeam) {
- SpecifiedTeam specifiedGroup = (SpecifiedTeam) pressButton.getAuthorized();
- if (specifiedGroup.getTeamName().equals(oldName))
- specifiedGroup.setTeamName(newName);
+ if (pressButton.getAuthorized() instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) pressButton.getAuthorized();
+ if (specifiedGroup.getGroupName().equals(oldName))
+ specifiedGroup.setGroupName(newName);
}
}
}
@@ -178,9 +178,9 @@ public class TransitionSpec implements Serializable {
TransitionTrigger trigger = getTrigger();
if (trigger instanceof PressButtonTrigger) {
PressButtonTrigger pressButton = (PressButtonTrigger) trigger;
- if (pressButton.getAuthorized() instanceof SpecifiedTeam) {
- SpecifiedTeam specifiedGroup = (SpecifiedTeam) pressButton.getAuthorized();
- if (specifiedGroup.getTeamName().equals(groupName))
+ if (pressButton.getAuthorized() instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) pressButton.getAuthorized();
+ if (specifiedGroup.getGroupName().equals(groupName))
return true;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/usermatcher/ProjectAdministrators.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/ProjectAdministrators.java
index 0f5b4b2e2f..a2d5556ce1 100644
--- a/core/src/main/java/io/onedev/server/model/support/usermatcher/ProjectAdministrators.java
+++ b/core/src/main/java/io/onedev/server/model/support/usermatcher/ProjectAdministrators.java
@@ -13,7 +13,7 @@ public class ProjectAdministrators implements UserMatcher {
@Override
public boolean matches(Project project, User user) {
- return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.PROJECT_ADMINISTRATION));
+ return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMINISTRATION));
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java
new file mode 100644
index 0000000000..c5999a2daf
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java
@@ -0,0 +1,42 @@
+package io.onedev.server.model.support.usermatcher;
+
+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 UserMatcher {
+
+ 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/usermatcher/SpecifiedTeam.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedTeam.java
deleted file mode 100644
index 1ffc25289f..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedTeam.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.onedev.server.model.support.usermatcher;
-
-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=600, name="Team")
-public class SpecifiedTeam implements UserMatcher {
-
- 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/search/entity/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index ea97af1b3d..36014fb75c 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
@@ -64,7 +64,7 @@ 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.numberinput.NumberInput;
-import io.onedev.server.util.inputspec.teamchoiceinput.TeamChoiceInput;
+import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;
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;
@@ -300,7 +300,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 TeamChoiceInput) {
+ || field instanceof GroupChoiceInput) {
return new ChoiceFieldCriteria(fieldName, value, -1, operator, false);
} else {
return new StringFieldCriteria(fieldName, value, operator);
@@ -428,7 +428,7 @@ public class IssueQuery extends EntityQuery<Issue> {
&& !(fieldSpec instanceof NumberInput)
&& !(fieldSpec instanceof ChoiceInput)
&& !(fieldSpec instanceof UserChoiceInput)
- && !(fieldSpec instanceof TeamChoiceInput)
+ && !(fieldSpec instanceof GroupChoiceInput)
&& !(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.java
index 186f951c6b..df90c409d2 100644
--- a/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
+++ b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
@@ -23,12 +23,12 @@ import org.slf4j.LoggerFactory;
import io.onedev.launcher.loader.AppLoader;
import io.onedev.server.manager.CacheManager;
+import io.onedev.server.manager.GroupManager;
import io.onedev.server.manager.MembershipManager;
import io.onedev.server.manager.SettingManager;
-import io.onedev.server.manager.TeamManager;
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.model.support.authenticator.Authenticated;
import io.onedev.server.model.support.authenticator.Authenticator;
@@ -38,9 +38,11 @@ import io.onedev.server.security.permission.CreateProjects;
import io.onedev.server.security.permission.ProjectPermission;
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.TeamFacade;
+import io.onedev.server.util.facade.UserAuthorizationFacade;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.utils.ExceptionUtils;
import io.onedev.utils.StringUtils;
@@ -58,11 +60,11 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
private final MembershipManager membershipManager;
- private final TeamManager teamManager;
-
+ private final GroupManager groupManager;
+
@Inject
public OneAuthorizingRealm(UserManager userManager, CacheManager cacheManager, SettingManager configManager,
- MembershipManager membershipManager, TeamManager teamManager) {
+ MembershipManager membershipManager, GroupManager groupManager) {
PasswordMatcher passwordMatcher = new PasswordMatcher();
passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));
setCredentialsMatcher(passwordMatcher);
@@ -71,7 +73,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
this.cacheManager = cacheManager;
this.configManager = configManager;
this.membershipManager = membershipManager;
- this.teamManager = teamManager;
+ this.groupManager = groupManager;
}
private Collection<Permission> getDefaultPermissions() {
@@ -92,15 +94,31 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
user = cacheManager.getUser(userId);
if (user != null) {
permissions.addAll(getDefaultPermissions());
- if (user.isRoot() || user.isAdministrator())
+ if (user.isRoot())
permissions.add(new SystemAdministration());
- if (user.isCanCreateProjects())
- permissions.add(new CreateProjects());
permissions.add(new UserAdministration(user));
- for (MembershipFacade membership: cacheManager.getMemberships().values()) {
+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {
if (membership.getUserId().equals(userId)) {
- TeamFacade team = cacheManager.getTeam(membership.getTeamId());
- permissions.add(new ProjectPermission(cacheManager.getProject(team.getProjectId()), team.getPrivilege()));
+ 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()));
}
}
} else if (configManager.getSecuritySetting().isEnableAnonymousAccess()) {
@@ -148,7 +166,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
} catch (Throwable e) {
if (e instanceof AuthenticationException) {
logger.debug("Authentication not passed", e);
- throw ExceptionUtils.unchecked(e);
+ throw ExceptionUtils.unchecked(e);
} else {
logger.error("Error authenticating user", e);
throw new AuthenticationException("Error authenticating user", e);
@@ -160,32 +178,30 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
if (authenticated.getFullName() != null)
user.setFullName(authenticated.getFullName());
- 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.find(teamFQN);
- if (team != null) {
- if (!existingTeamFQNs.contains(teamFQN)) {
+ 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)) {
Membership membership = new Membership();
- membership.setTeam(team);
+ membership.setGroup(group);
membership.setUser(user);
membershipManager.save(membership);
user.getMemberships().add(membership);
- existingTeamFQNs.add(teamFQN);
+ existingGroupNames.add(groupName);
}
- retrievedTeamFQNs.add(teamFQN);
+ retrievedGroupNames.add(groupName);
} else {
- logger.debug("Team '{}' from external authenticator is not defined", teamFQN);
+ logger.debug("Group '{}' from external authenticator is not defined", groupName);
}
}
for (Iterator<Membership> it = user.getMemberships().iterator(); it.hasNext();) {
Membership membership = it.next();
- if (!retrievedTeamFQNs.contains(membership.getTeam().getFQN())) {
+ if (!retrievedGroupNames.contains(membership.getGroup().getName())) {
it.remove();
membershipManager.delete(membership);
}
@@ -201,6 +217,20 @@ 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/SecurityUtils.java b/core/src/main/java/io/onedev/server/security/SecurityUtils.java
index b08456e8ae..40038a83d9 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.stream.Collectors;
+import java.util.Set;
import javax.annotation.Nullable;
@@ -29,9 +29,11 @@ import io.onedev.server.security.permission.ProjectPermission;
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.TeamFacade;
+import io.onedev.server.util.facade.UserAuthorizationFacade;
import io.onedev.server.util.facade.UserFacade;
public class SecurityUtils extends org.apache.shiro.SecurityUtils {
@@ -42,32 +44,33 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
if (project.getDefaultPrivilege() != null && project.getDefaultPrivilege().getProjectPrivilege().implies(privilege)) {
authorizedUsers.addAll(cacheManager.getUsers().values());
} else {
- for (UserFacade user: cacheManager.getUsers().values()) {
- if (user.isRoot() || user.isAdministrator())
- authorizedUsers.add(user);
- }
+ authorizedUsers.add(OneDev.getInstance(UserManager.class).getRoot().getFacade());
- Collection<Long> authorizedTeamIds =
- getAuthorizedTeams(project, privilege).stream().map(it->it.getId()).collect(Collectors.toSet());
+ 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 (MembershipFacade membership: cacheManager.getMemberships().values()) {
- if (authorizedTeamIds.contains(membership.getTeamId()))
+ if (authorizedGroupIds.contains(membership.getGroupId()))
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 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 User getUser() {
return OneDev.getInstance(UserManager.class).getCurrent();
}
@@ -132,7 +135,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canAdministrate(ProjectFacade project) {
- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.PROJECT_ADMINISTRATION));
+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ADMINISTRATION));
}
public static boolean isAdministrator() {
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.java
index f1eba7116f..d6f82d3551 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
@@ -25,7 +25,7 @@ public enum ProjectPrivilege {
}
},
- PROJECT_ADMINISTRATION("Project administration") {
+ ADMINISTRATION("Administration") {
@Override
public boolean implies(ProjectPrivilege privilege) {
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.java
new file mode 100644
index 0000000000..d8b3e21448
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/facade/GroupAuthorizationFacade.java
@@ -0,0 +1,36 @@
+package io.onedev.server.util.facade;
+
+import io.onedev.server.model.GroupAuthorization;
+import io.onedev.server.security.permission.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.java
new file mode 100644
index 0000000000..aa424c92a4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/facade/GroupFacade.java
@@ -0,0 +1,34 @@
+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.java
index be256afc32..ec3fd953f4 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 teamId;
+ private final Long groupId;
private final Long userId;
public MembershipFacade(Membership membership) {
super(membership.getId());
- teamId = membership.getTeam().getId();
+ groupId = membership.getGroup().getId();
userId = membership.getUser().getId();
}
- public Long getTeamId() {
- return teamId;
+ public Long getGroupId() {
+ return groupId;
}
public Long getUserId() {
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.java
deleted file mode 100644
index 5df372d1e6..0000000000
--- a/core/src/main/java/io/onedev/server/util/facade/TeamFacade.java
+++ /dev/null
@@ -1,39 +0,0 @@
-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.java
new file mode 100644
index 0000000000..ef2e295054
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/facade/UserAuthorizationFacade.java
@@ -0,0 +1,36 @@
+package io.onedev.server.util.facade;
+
+import io.onedev.server.model.UserAuthorization;
+import io.onedev.server.security.permission.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.java
index 1292a4f098..ba53f95b39 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,10 +15,6 @@ 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) {
@@ -27,8 +23,6 @@ public class UserFacade extends EntityFacade {
name = user.getName();
fullName = user.getFullName();
email = user.getEmail();
- administrator = user.isAdministrator();
- canCreateProjects = user.isCanCreateProjects();
uuid = user.getUUID();
}
@@ -44,14 +38,6 @@ public class UserFacade extends EntityFacade {
return email;
}
- public boolean isAdministrator() {
- return administrator;
- }
-
- public boolean isCanCreateProjects() {
- return canCreateProjects;
- }
-
public String getUUID() {
return uuid;
}
@@ -77,5 +63,9 @@ public class UserFacade extends EntityFacade {
double scoreOfFullName = MatchScoreUtils.getMatchScore(fullName, queryTerm);
return Math.max(scoreOfName, scoreOfFullName);
}
+
+ public static UserFacade of(@Nullable User user) {
+ return user!=null?new UserFacade(user):null;
+ }
}
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.java
index 2bb14bba36..5e0d7b035a 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 TEAM = "Team";
+ public static final String GROUP = "Group";
public static final String ISSUE = "Issue";
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/TeamChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
similarity index 77%
rename from core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/TeamChoiceInput.java
rename to core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
index ad60bde1b2..d88a3e950d 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/TeamChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.inputspec.teamchoiceinput;
+package io.onedev.server.util.inputspec.groupchoiceinput;
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.TeamFacade;
+import io.onedev.server.util.facade.GroupFacade;
import io.onedev.server.util.inputspec.InputSpec;
-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.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.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.TEAM)
-public class TeamChoiceInput extends InputSpec {
+@Editable(order=160, name=InputSpec.GROUP)
+public class GroupChoiceInput extends InputSpec {
private static final long serialVersionUID = 1L;
- private ChoiceProvider choiceProvider = new AllTeams();
+ private ChoiceProvider choiceProvider = new AllGroups();
private DefaultValueProvider defaultValueProvider;
@@ -51,8 +51,8 @@ public class TeamChoiceInput extends InputSpec {
public List<String> getPossibleValues() {
List<String> possibleValues = new ArrayList<>();
if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty()) {
- for (TeamFacade team: getChoiceProvider().getChoices(true))
- possibleValues.add(team.getName());
+ for (GroupFacade group: getChoiceProvider().getChoices(true))
+ possibleValues.add(group.getName());
}
return possibleValues;
}
@@ -65,7 +65,7 @@ public class TeamChoiceInput extends InputSpec {
appendCommonAnnotations(buffer, index);
if (!isAllowEmpty())
buffer.append(" @NotEmpty\n");
- appendChoiceProvider(buffer, index, "@TeamChoice");
+ appendChoiceProvider(buffer, index, "@GroupChoice");
appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);
return buffer.toString();
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.java
new file mode 100644
index 0000000000..88b04ffa3f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.java
@@ -0,0 +1,32 @@
+package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+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) {
+ List<GroupFacade> groups = new ArrayList<>(OneDev.getInstance(CacheManager.class).getGroups().values());
+ Collections.sort(groups, new Comparator<GroupFacade>() {
+
+ @Override
+ public int compare(GroupFacade o1, GroupFacade o2) {
+ return o1.getName().compareTo(o2.getName());
+ }
+
+ });
+ return groups;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ChoiceProvider.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java
similarity index 51%
rename from core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ChoiceProvider.java
rename to core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java
index 55c065cb47..986c5fd739 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ChoiceProvider.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java
@@ -1,14 +1,14 @@
-package io.onedev.server.util.inputspec.teamchoiceinput.choiceprovider;
+package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;
import java.io.Serializable;
import java.util.List;
-import io.onedev.server.util.facade.TeamFacade;
+import io.onedev.server.util.facade.GroupFacade;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
public interface ChoiceProvider extends Serializable {
- List<TeamFacade> getChoices(boolean allPossible);
+ List<GroupFacade> getChoices(boolean allPossible);
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ScriptingChoices.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ScriptingChoices.java
rename to core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
index c31d770667..4102fada7b 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/ScriptingChoices.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.inputspec.teamchoiceinput.choiceprovider;
+package io.onedev.server.util.inputspec.groupchoiceinput.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.TeamFacade;
+import io.onedev.server.util.facade.GroupFacade;
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 team facade object to be used as choices. "
+ @Editable(description="Groovy script to be evaluated. The return value should be a list of group 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<TeamFacade> getChoices(boolean allPossible) {
+ public List<GroupFacade> getChoices(boolean allPossible) {
Map<String, Object> variables = new HashMap<>();
variables.put("allPossible", allPossible);
try {
- return (List<TeamFacade>) GroovyUtils.evalScript(getScript(), variables);
+ return (List<GroupFacade>) 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/teamchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java
similarity index 71%
rename from core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/DefaultValueProvider.java
rename to core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java
index 20db0290bd..840810ad4b 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/DefaultValueProvider.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.inputspec.teamchoiceinput.defaultvalueprovider;
+package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;
import java.io.Serializable;
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
similarity index 90%
rename from core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
rename to core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index 744bdb2d53..62b12fa8e4 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.inputspec.teamchoiceinput.defaultvalueprovider;
+package io.onedev.server.util.inputspec.groupchoiceinput.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 team. "
+ @Editable(description="Groovy script to be evaluated. It should return name of a group. "
+ "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
similarity index 75%
rename from core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
rename to core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
index 3999d961f0..1d5f9d6633 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.inputspec.teamchoiceinput.defaultvalueprovider;
+package io.onedev.server.util.inputspec.groupchoiceinput.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.TeamFacade;
-import io.onedev.server.util.inputspec.teamchoiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.util.facade.GroupFacade;
+import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.TeamChoice;
+import io.onedev.server.web.editable.annotation.GroupChoice;
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")
- @TeamChoice("getValueChoices")
+ @GroupChoice("getValueChoices")
@NotEmpty
@OmitName
public String getValue() {
@@ -41,7 +41,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {
}
@SuppressWarnings("unused")
- private static List<TeamFacade> getValueChoices() {
+ private static List<GroupFacade> 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/teamchoiceinput/choiceprovider/AllTeams.java b/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/AllTeams.java
deleted file mode 100644
index 8478a68ab2..0000000000
--- a/core/src/main/java/io/onedev/server/util/inputspec/teamchoiceinput/choiceprovider/AllTeams.java
+++ /dev/null
@@ -1,27 +0,0 @@
-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/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
index db42d1841a..a862050059 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
@@ -12,7 +12,7 @@ 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.IssueReaders;
-import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.TeamUsers;
+import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.GroupUsers;
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;
@@ -101,10 +101,10 @@ public class UserChoiceInput extends InputSpec {
@Override
public void onRenameGroup(String oldName, String newName) {
- if (choiceProvider instanceof TeamUsers) {
- TeamUsers groupUsers = (TeamUsers) choiceProvider;
- if (groupUsers.getTeamName().equals(oldName))
- groupUsers.setTeamName(newName);
+ if (choiceProvider instanceof GroupUsers) {
+ GroupUsers groupUsers = (GroupUsers) choiceProvider;
+ if (groupUsers.getGroupName().equals(oldName))
+ groupUsers.setGroupName(newName);
}
}
@@ -112,9 +112,9 @@ public class UserChoiceInput extends InputSpec {
public boolean onDeleteGroup(String groupName) {
if (super.onDeleteGroup(groupName))
return true;
- if (choiceProvider instanceof TeamUsers) {
- TeamUsers groupUsers = (TeamUsers) choiceProvider;
- if (groupUsers.getTeamName().equals(groupName))
+ if (choiceProvider instanceof GroupUsers) {
+ GroupUsers groupUsers = (GroupUsers) choiceProvider;
+ if (groupUsers.getGroupName().equals(groupName))
return true;
}
return false;
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/TeamUsers.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.java
similarity index 51%
rename from core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/TeamUsers.java
rename to core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.java
index 68ce9b5ac6..28a7c6ecab 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/TeamUsers.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.java
@@ -6,40 +6,39 @@ import java.util.List;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.TeamManager;
-import io.onedev.server.model.Team;
+import io.onedev.server.manager.GroupManager;
+import io.onedev.server.model.Group;
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.TeamChoice;
import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.web.editable.annotation.GroupChoice;
-@Editable(order=150, name="Users belonging to team")
-public class TeamUsers implements ChoiceProvider {
+@Editable(order=150, name="Users belonging to group")
+public class GroupUsers implements ChoiceProvider {
private static final long serialVersionUID = 1L;
- private String teamName;
+ private String groupName;
- @Editable(name="Team")
- @TeamChoice
+ @Editable(name="Group")
+ @GroupChoice
@OmitName
@NotEmpty
- public String getTeamName() {
- return teamName;
+ public String getGroupName() {
+ return groupName;
}
- public void setTeamName(String teamName) {
- this.teamName = teamName;
+ public void setGroupName(String groupName) {
+ this.groupName = groupName;
}
@Override
public List<UserFacade> getChoices(boolean allPossible) {
List<UserFacade> choices = new ArrayList<>();
- Team team = OneDev.getInstance(TeamManager.class).find(OneContext.get().getProject(), teamName);
- if (team != null) {
- for (User user: team.getMembers())
+ Group group = OneDev.getInstance(GroupManager.class).find(groupName);
+ if (group != null) {
+ for (User user: group.getMembers())
choices.add(user.getFacade());
}
return choices;
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.java
index f4143b0efc..c9a6a2a354 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
@@ -18,7 +18,7 @@ public class ProjectAdministrators implements ChoiceProvider {
@Override
public List<UserFacade> getChoices(boolean allPossible) {
Project project = OneContext.get().getProject();
- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.PROJECT_ADMINISTRATION));
+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ADMINISTRATION));
}
}
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.g4
index 486b046182..1e71f92c9f 100644
--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
+++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
@@ -2,17 +2,17 @@ grammar ReviewRequirement;
requirement: ' '* criteria (' '+ criteria)* ' '* EOF;
-criteria: userCriteria | teamCriteria;
+criteria: userCriteria | groupCriteria;
userCriteria: USER Value;
-teamCriteria: TEAM Value (':' count)?;
+groupCriteria: GROUP Value (':' count)?;
count: 'all' | DIGIT;
DIGIT: [1-9][0-9]*;
USER: 'user';
-TEAM: 'team';
+GROUP: 'group';
Value: '(' (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.java
index 82f6d4137c..1de61179bf 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,32 +12,30 @@ 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.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.exception.OneException;
-import io.onedev.server.manager.TeamManager;
+import io.onedev.server.manager.GroupManager;
import io.onedev.server.manager.UserManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.Team;
+import io.onedev.server.model.Group;
import io.onedev.server.model.User;
+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CountContext;
+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CriteriaContext;
+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.RequirementContext;
public class ReviewRequirement {
private final List<User> users;
- private final Map<Team, Integer> teams;
+ private final Map<Group, Integer> groups;
- public ReviewRequirement(List<User> users, Map<Team, Integer> teams) {
+ public ReviewRequirement(List<User> users, Map<Group, Integer> groups) {
this.users = users;
- this.teams = teams;
+ this.groups = groups;
}
- public static ReviewRequirement parse(Project project, String requirementString) {
+ public static ReviewRequirement fromString(String requirementString) {
List<User> users = new ArrayList<>();
- Map<Team, Integer> teams = new LinkedHashMap<>();
+ Map<Group, Integer> groups = new LinkedHashMap<>();
if (requirementString != null) {
RequirementContext requirement = parse(requirementString);
@@ -55,31 +53,31 @@ public class ReviewRequirement {
} else {
throw new OneException("Unable to find user '" + userName + "'");
}
- } 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();
+ } else if (criteria.groupCriteria() != null) {
+ String groupName = getBracedValue(criteria.groupCriteria().Value());
+ Group group = OneDev.getInstance(GroupManager.class).find(groupName);
+ if (group != null) {
+ if (!groups.containsKey(group)) {
+ CountContext count = criteria.groupCriteria().count();
if (count != null) {
if (count.DIGIT() != null)
- teams.put(team, Integer.parseInt(count.DIGIT().getText()));
+ groups.put(group, Integer.parseInt(count.DIGIT().getText()));
else
- teams.put(team, 0);
+ groups.put(group, 0);
} else {
- teams.put(team, 1);
+ groups.put(group, 1);
}
} else {
- throw new OneException("Team '" + teamName + "' is included multiple times");
+ throw new OneException("Group '" + groupName + "' is included multiple times");
}
} else {
- throw new OneException("Unable to find team '" + teamName + "'");
+ throw new OneException("Unable to find group '" + groupName + "'");
}
}
}
}
- return new ReviewRequirement(users, teams);
+ return new ReviewRequirement(users, groups);
}
public static RequirementContext parse(String requirementString) {
@@ -102,8 +100,8 @@ public class ReviewRequirement {
return users;
}
- public Map<Team, Integer> getTeams() {
- return teams;
+ public Map<Group, Integer> getGroups() {
+ return groups;
}
public boolean satisfied(User user) {
@@ -111,13 +109,13 @@ public class ReviewRequirement {
if (!eachUser.equals(user))
return false;
}
- for (Map.Entry<Team, Integer> entry: teams.entrySet()) {
- Team team = entry.getKey();
+ for (Map.Entry<Group, Integer> entry: groups.entrySet()) {
+ Group group = entry.getKey();
int requiredCount = entry.getValue();
- if (requiredCount == 0 || requiredCount > team.getMembers().size())
- requiredCount = team.getMembers().size();
+ if (requiredCount == 0 || requiredCount > group.getMembers().size())
+ requiredCount = group.getMembers().size();
- if (requiredCount > 1 || requiredCount == 1 && !team.getMembers().contains(user))
+ if (requiredCount > 1 || requiredCount == 1 && !group.getMembers().contains(user))
return false;
}
return true;
@@ -129,8 +127,8 @@ public class ReviewRequirement {
StringBuilder builder = new StringBuilder();
for (User user: users)
builder.append("user(").append(user.getName()).append(") ");
- for (Map.Entry<Team, Integer> entry: teams.entrySet()) {
- builder.append("team(").append(entry.getKey().getName()).append(")");
+ for (Map.Entry<Group, Integer> entry: groups.entrySet()) {
+ builder.append("group(").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/userident/EmailAwareIdent.java b/core/src/main/java/io/onedev/server/util/userident/EmailAwareIdent.java
new file mode 100644
index 0000000000..79e1b05634
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/userident/EmailAwareIdent.java
@@ -0,0 +1,9 @@
+package io.onedev.server.util.userident;
+
+public abstract class EmailAwareIdent extends UserIdent {
+
+ private static final long serialVersionUID = 1L;
+
+ public abstract String getEmail();
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/userident/GitUserIdent.java b/core/src/main/java/io/onedev/server/util/userident/GitUserIdent.java
new file mode 100644
index 0000000000..43294600ae
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/userident/GitUserIdent.java
@@ -0,0 +1,41 @@
+package io.onedev.server.util.userident;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class GitUserIdent extends EmailAwareIdent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ private final String email;
+
+ private final String gitRole;
+
+ @JsonCreator
+ public GitUserIdent(@JsonProperty("name") String name, @JsonProperty("email") String email, @JsonProperty("gitRole") String gitRole) {
+ this.name = name;
+ this.email = email;
+ this.gitRole = gitRole;
+ }
+
+ public GitUserIdent(String name, String email) {
+ this(name, email, "Name in Git");
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String getEmail() {
+ return email;
+ }
+
+ public String getGitRole() {
+ return gitRole;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/userident/OrdinaryUserIdent.java b/core/src/main/java/io/onedev/server/util/userident/OrdinaryUserIdent.java
new file mode 100644
index 0000000000..5b9fd694ea
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/userident/OrdinaryUserIdent.java
@@ -0,0 +1,30 @@
+package io.onedev.server.util.userident;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class OrdinaryUserIdent extends EmailAwareIdent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ private final String email;
+
+ @JsonCreator
+ public OrdinaryUserIdent(@JsonProperty("name") String name, @JsonProperty("email") String email) {
+ this.name = name;
+ this.email = email;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String getEmail() {
+ return email;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/userident/RemovedUserIdent.java b/core/src/main/java/io/onedev/server/util/userident/RemovedUserIdent.java
new file mode 100644
index 0000000000..42591f357a
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/userident/RemovedUserIdent.java
@@ -0,0 +1,22 @@
+package io.onedev.server.util.userident;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class RemovedUserIdent extends UserIdent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ @JsonCreator
+ public RemovedUserIdent(@JsonProperty("name") String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/userident/SystemUserIdent.java b/core/src/main/java/io/onedev/server/util/userident/SystemUserIdent.java
new file mode 100644
index 0000000000..3ee9b961dd
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/userident/SystemUserIdent.java
@@ -0,0 +1,14 @@
+package io.onedev.server.util.userident;
+
+import io.onedev.server.OneDev;
+
+public class SystemUserIdent extends UserIdent {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getName() {
+ return OneDev.NAME;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/userident/UserIdent.java b/core/src/main/java/io/onedev/server/util/userident/UserIdent.java
new file mode 100644
index 0000000000..18e52663e3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/userident/UserIdent.java
@@ -0,0 +1,46 @@
+package io.onedev.server.util.userident;
+
+import java.io.Serializable;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.jgit.lib.PersonIdent;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+
+import io.onedev.server.util.facade.UserFacade;
+
+@JsonTypeInfo(property="@class", use = Id.CLASS)
+public abstract class UserIdent implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public abstract String getName();
+
+ public static UserIdent of(@Nullable UserFacade user) {
+ if (user != null)
+ return new OrdinaryUserIdent(user.getDisplayName(), user.getEmail());
+ else
+ return new SystemUserIdent();
+ }
+
+ public static UserIdent of(@Nullable UserFacade user, @Nullable String userName) {
+ if (user != null) {
+ return new OrdinaryUserIdent(user.getDisplayName(), user.getEmail());
+ } else if (userName != null) {
+ return new RemovedUserIdent(userName);
+ } else {
+ return new SystemUserIdent();
+ }
+ }
+
+ public static UserIdent of(PersonIdent person) {
+ return new GitUserIdent(person.getName(), person.getEmailAddress());
+ }
+
+ public static UserIdent of(PersonIdent person, String gitRole) {
+ return new GitUserIdent(person.getName(), person.getEmailAddress(), gitRole);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/user/CurrentPasswordValidator.java b/core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java
similarity index 79%
rename from core/src/main/java/io/onedev/server/web/page/user/CurrentPasswordValidator.java
rename to core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java
index 72ae20fbb5..2e14c70fde 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/CurrentPasswordValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.util.validation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
@@ -7,18 +7,18 @@ import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.UsernamePasswordToken;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.util.WicketUtils;
+import io.onedev.server.util.validation.annotation.CurrentPassword;
public class CurrentPasswordValidator implements ConstraintValidator<CurrentPassword, String> {
+ @Override
public void initialize(CurrentPassword constaintAnnotation) {
}
+ @Override
public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
if (value != null) {
- UserPage page = (UserPage) WicketUtils.getPage();
-
- AuthenticationToken token = new UsernamePasswordToken(page.getUser().getName(), value);
+ AuthenticationToken token = new UsernamePasswordToken(SecurityUtils.getUser().getName(), value);
try {
if (SecurityUtils.getSecurityManager().authenticate(token) != null)
return true;
diff --git a/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java b/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java
index 181e946005..5cb96ae989 100644
--- a/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java
@@ -4,8 +4,6 @@ import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
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 ReviewRequirementValidator implements ConstraintValidator<ReviewRequirement, String> {
@@ -19,9 +17,8 @@ public class ReviewRequirementValidator implements ConstraintValidator<ReviewReq
if (value == null) {
return true;
} else {
- Project project = OneContext.get().getProject();
try {
- io.onedev.server.util.reviewrequirement.ReviewRequirement.parse(project, value);
+ io.onedev.server.util.reviewrequirement.ReviewRequirement.fromString(value);
return true;
} catch (OneException e) {
constraintContext.disableDefaultConstraintViolation();
diff --git a/core/src/main/java/io/onedev/server/web/page/user/CurrentPassword.java b/core/src/main/java/io/onedev/server/util/validation/annotation/CurrentPassword.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/web/page/user/CurrentPassword.java
rename to core/src/main/java/io/onedev/server/util/validation/annotation/CurrentPassword.java
index a99b46bae2..a87b5cb909 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/CurrentPassword.java
+++ b/core/src/main/java/io/onedev/server/util/validation/annotation/CurrentPassword.java
@@ -5,7 +5,7 @@
*
* Revision: $Id: PathElement.java 1209 2008-07-28 00:16:18Z robin $
*/
-package io.onedev.server.web.page.user;
+package io.onedev.server.util.validation.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -15,13 +15,15 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
+import io.onedev.server.util.validation.CurrentPasswordValidator;
+
/**
* @author robin
*/
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy=CurrentPasswordValidator.class)
-@interface CurrentPassword {
+public @interface CurrentPassword {
String message() default "Old password does not match";
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 8d485272b0..3e8334aa80 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -11,19 +11,35 @@ import org.apache.wicket.request.mapper.CompoundRequestMapper;
import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
+import io.onedev.server.web.page.admin.group.GroupAuthorizationsPage;
+import io.onedev.server.web.page.admin.group.GroupListPage;
+import io.onedev.server.web.page.admin.group.GroupMembershipsPage;
+import io.onedev.server.web.page.admin.group.GroupProfilePage;
+import io.onedev.server.web.page.admin.group.NewGroupPage;
import io.onedev.server.web.page.admin.licensemanagement.LicenseManagementPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
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.admin.user.NewUserPage;
+import io.onedev.server.web.page.admin.user.UserAuthorizationsPage;
+import io.onedev.server.web.page.admin.user.UserAvatarPage;
+import io.onedev.server.web.page.admin.user.UserListPage;
+import io.onedev.server.web.page.admin.user.UserMembershipsPage;
+import io.onedev.server.web.page.admin.user.UserPasswordPage;
+import io.onedev.server.web.page.admin.user.UserProfilePage;
+import io.onedev.server.web.page.admin.user.UserTokenPage;
import io.onedev.server.web.page.init.ServerInitPage;
+import io.onedev.server.web.page.my.MyAvatarPage;
+import io.onedev.server.web.page.my.MyPasswordPage;
+import io.onedev.server.web.page.my.MyProfilePage;
+import io.onedev.server.web.page.my.MyTokenPage;
import io.onedev.server.web.page.project.NewProjectPage;
import io.onedev.server.web.page.project.NoCommitsPage;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
-import io.onedev.server.web.page.project.builds.BuildListPage;
import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
@@ -31,9 +47,6 @@ import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
-import io.onedev.server.web.page.project.issues.detail.IssueBuildsPage;
-import io.onedev.server.web.page.project.issues.detail.IssueCommitsPage;
-import io.onedev.server.web.page.project.issues.detail.IssuePullRequestsPage;
import io.onedev.server.web.page.project.issues.list.IssueListPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;
@@ -46,6 +59,7 @@ import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequest
import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;
import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;
import io.onedev.server.web.page.project.pullrequests.list.PullRequestListPage;
+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;
@@ -56,10 +70,6 @@ import io.onedev.server.web.page.project.setting.issueworkflow.fields.IssueField
import 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.setting.webhook.WebHooksPage;
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;
@@ -68,13 +78,6 @@ import io.onedev.server.web.page.security.LoginPage;
import io.onedev.server.web.page.security.LogoutPage;
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.UserListPage;
-import io.onedev.server.web.page.user.UserProfilePage;
import io.onedev.server.web.util.mapper.OnePageMapper;
import io.onedev.server.web.util.mapper.OneResourceMapper;
import io.onedev.server.web.util.resource.ArchiveResourceReference;
@@ -86,9 +89,9 @@ public class OneUrlMapper extends CompoundRequestMapper {
public OneUrlMapper(WebApplication app) {
add(new OnePageMapper("init", ServerInitPage.class));
- addAdministrationPages();
- addUserPages();
addProjectPages();
+ addMyPages();
+ addAdministrationPages();
addSecurityPages();
add(new OnePageMapper("test", TestPage.class));
@@ -96,6 +99,13 @@ public class OneUrlMapper extends CompoundRequestMapper {
addResources();
}
+ private void addMyPages() {
+ add(new OnePageMapper("my/profile", MyProfilePage.class));
+ add(new OnePageMapper("my/avatar", MyAvatarPage.class));
+ add(new OnePageMapper("my/password", MyPasswordPage.class));
+ add(new OnePageMapper("my/token", MyTokenPage.class));
+ }
+
private void addResources() {
add(new ResourceMapper("resource/server-log", new ServerLogResourceReference()));
add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveResourceReference()));
@@ -112,6 +122,21 @@ public class OneUrlMapper extends CompoundRequestMapper {
}
private void addAdministrationPages() {
+ add(new OnePageMapper("administration/users", UserListPage.class));
+ add(new OnePageMapper("administration/users/new", NewUserPage.class));
+ add(new OnePageMapper("administration/users/${user}/profile", UserProfilePage.class));
+ add(new OnePageMapper("administration/users/${user}/groups", UserMembershipsPage.class));
+ add(new OnePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));
+ add(new OnePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));
+ add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));
+ add(new OnePageMapper("administration/users/${user}/token", UserTokenPage.class));
+
+ add(new OnePageMapper("administration/groups", GroupListPage.class));
+ add(new OnePageMapper("administration/groups/new", NewGroupPage.class));
+ add(new OnePageMapper("administration/groups/${group}/profile", GroupProfilePage.class));
+ add(new OnePageMapper("administration/groups/${group}/members", GroupMembershipsPage.class));
+ add(new OnePageMapper("administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));
+
add(new OnePageMapper("administration/settings/system", SystemSettingPage.class));
add(new OnePageMapper("administration/settings/mail", MailSettingPage.class));
add(new OnePageMapper("administration/settings/backup", DatabaseBackupPage.class));
@@ -122,16 +147,6 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("administration/license-management", LicenseManagementPage.class));
}
- private void addUserPages() {
- 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}/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 addProjectPages() {
add(new OnePageMapper("projects", ProjectListPage.class) {
@@ -197,22 +212,14 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/issue-boards/${board}", IssueBoardsPage.class));
add(new OnePageMapper("projects/${project}/issue-list", IssueListPage.class));
add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));
- add(new OnePageMapper("projects/${project}/issues/${issue}/commits", IssueCommitsPage.class));
- add(new OnePageMapper("projects/${project}/issues/${issue}/builds", IssueBuildsPage.class));
- add(new OnePageMapper("projects/${project}/issues/${issue}/pulls", IssuePullRequestsPage.class));
add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));
add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));
add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));
add(new OnePageMapper("projects/${project}/milestones/${milestone}/edit", MilestoneEditPage.class));
add(new OnePageMapper("projects/${project}/milestones/new", NewMilestonePage.class));
- add(new OnePageMapper("projects/${project}/builds", BuildListPage.class));
-
add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));
- add(new OnePageMapper("projects/${project}/settings/avatar", io.onedev.server.web.page.project.setting.avatar.AvatarEditPage.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/authorizations", ProjectAuthorizationsPage.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));
@@ -222,7 +229,6 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/settings/configurations", ConfigurationListPage.class));
add(new OnePageMapper("projects/${project}/settings/configurations/new", NewConfigurationPage.class));
add(new OnePageMapper("projects/${project}/settings/configurations/${configuration}", ConfigurationEditPage.class));
- add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));
add(new OnePageMapper("projects/${project}/no-commits", NoCommitsPage.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.java
index c413c04980..bc8c37cf0f 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
@@ -35,7 +35,7 @@ import io.onedev.server.exception.OneException;
import io.onedev.server.manager.BuildManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.PullRequestManager;
-import io.onedev.server.manager.TeamManager;
+import io.onedev.server.manager.GroupManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -56,8 +56,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;
@@ -174,8 +174,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
}
} else if (fieldSpec instanceof BooleanInput) {
suggestions.addAll(SuggestionUtils.suggest(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith, null));
- } else if (fieldSpec instanceof TeamChoiceInput) {
- List<String> candidates = OneDev.getInstance(TeamManager.class).query().stream().map(it->it.getName()).collect(Collectors.toList());
+ } else if (fieldSpec instanceof GroupChoiceInput) {
+ List<String> candidates = OneDev.getInstance(GroupManager.class).query().stream().map(it->it.getName()).collect(Collectors.toList());
suggestions.addAll(SuggestionUtils.suggest(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/behavior/dropdown/DropdownHover.java b/core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.java
similarity index 77%
rename from core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHover.java
rename to core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.java
index cc10ae9211..de2629bb48 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHover.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.java
@@ -16,7 +16,7 @@ import io.onedev.server.web.component.floating.ComponentTarget;
import io.onedev.server.web.component.floating.FloatingPanel;
@SuppressWarnings("serial")
-public abstract class DropdownHover extends AbstractPostAjaxBehavior {
+public abstract class DropdownHoverBehavior extends AbstractPostAjaxBehavior {
private static final int DEFAULT_HOVER_DELAY = 350;
@@ -28,23 +28,23 @@ public abstract class DropdownHover extends AbstractPostAjaxBehavior {
private FloatingPanel dropdown;
- public DropdownHover() {
+ public DropdownHoverBehavior() {
this(AlignPlacement.bottom(0));
}
- public DropdownHover(AlignPlacement placement) {
+ public DropdownHoverBehavior(AlignPlacement placement) {
this(placement, DEFAULT_HOVER_DELAY);
}
- public DropdownHover(AlignPlacement placement, int hoverDelay) {
+ public DropdownHoverBehavior(AlignPlacement placement, int hoverDelay) {
this(null, placement, hoverDelay);
}
- public DropdownHover(@Nullable Component alignTarget, AlignPlacement placement) {
+ public DropdownHoverBehavior(@Nullable Component alignTarget, AlignPlacement placement) {
this(alignTarget, placement, DEFAULT_HOVER_DELAY);
}
- public DropdownHover(@Nullable Component alignTarget, AlignPlacement placement, int hoverDelay) {
+ public DropdownHoverBehavior(@Nullable Component alignTarget, AlignPlacement placement, int hoverDelay) {
this.alignTarget = alignTarget;
this.placement = placement;
this.hoverDelay = hoverDelay;
@@ -62,12 +62,12 @@ public abstract class DropdownHover extends AbstractPostAjaxBehavior {
@Override
protected void onInitialize() {
super.onInitialize();
- DropdownHover.this.onInitialize(this);
+ DropdownHoverBehavior.this.onInitialize(this);
}
@Override
protected Component newContent(String id) {
- return DropdownHover.this.newContent(id);
+ return DropdownHoverBehavior.this.newContent(id);
}
@Override
@@ -76,7 +76,7 @@ public abstract class DropdownHover extends AbstractPostAjaxBehavior {
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
if (target != null) {
- String script = String.format("onedev.server.dropdownhover.closed('%s', '%s');",
+ String script = String.format("onedev.server.dropdownHover.closed('%s', '%s');",
getComponent().getMarkupId(true), getMarkupId(true));
target.appendJavaScript(script);
}
@@ -85,7 +85,7 @@ public abstract class DropdownHover extends AbstractPostAjaxBehavior {
}
};
- String script = String.format("onedev.server.dropdownhover.opened('%s', '%s');",
+ String script = String.format("onedev.server.dropdownHover.opened('%s', '%s');",
getComponent().getMarkupId(true), dropdown.getMarkupId(true));
target.appendJavaScript(script);
}
@@ -101,7 +101,7 @@ public abstract class DropdownHover extends AbstractPostAjaxBehavior {
super.renderHead(component, response);
response.render(JavaScriptHeaderItem.forReference(new DropdownHoverResourceReference()));
- String script = String.format("onedev.server.dropdownhover.init('%s', %s, %s);",
+ String script = String.format("onedev.server.dropdownHover.onDomReady('%s', %s, %s);",
getComponent().getMarkupId(true), hoverDelay, getCallbackFunction());
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js b/core/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js
index 20b692b383..d0e4efc69b 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js
+++ b/core/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js
@@ -1,5 +1,5 @@
-onedev.server.dropdownhover = {
- init: function(triggerId, hoverDelay, openCallback) {
+onedev.server.dropdownHover = {
+ onDomReady: function(triggerId, hoverDelay, openCallback) {
var $trigger = $("#" + triggerId);
$trigger.addClass("dropdown-hover");
diff --git a/core/src/main/java/io/onedev/server/web/component/link/BranchLink.java b/core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/component/link/BranchLink.java
rename to core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java
index 75ab9631ed..75e8a4fbaf 100644
--- a/core/src/main/java/io/onedev/server/web/component/link/BranchLink.java
+++ b/core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.link;
+package io.onedev.server.web.component.branch;
import javax.annotation.Nullable;
@@ -11,6 +11,7 @@ import org.eclipse.jgit.lib.FileMode;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.ProjectAndBranch;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
index c4bb83644a..fbb897861b 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
@@ -11,7 +11,7 @@
<div class="user-avatar"><a wicket:id="userAvatar"></a></div>
<div class="detail">
<div class="head clearfix">
- <a wicket:id="userName" class="user-name pull-left"></a>
+ <span wicket:id="userName" class="user-name pull-left"></span>
<span class="reply pull-right">
<span wicket:id="action" class="action"></span>
<span wicket:id="date" class="date"></span>
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.java
index e6115a40b7..3bcff82b63 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
@@ -48,12 +48,14 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.asset.caret.CaretResourceReference;
-import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.MarkdownViewer;
import io.onedev.server.web.component.project.comment.CommentInput;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
@@ -102,9 +104,9 @@ public abstract class CodeCommentPanel extends Panel {
}));
- User userForDisplay = User.getForDisplay(getComment().getUser(), getComment().getUserName());
- commentContainer.add(new UserAvatarLink("userAvatar", userForDisplay));
- commentContainer.add(new UserLink("userName", userForDisplay));
+ UserIdent userIdent = UserIdent.of(UserFacade.of(getComment().getUser()), getComment().getUserName());
+ commentContainer.add(new UserIdentPanel("userAvatar", userIdent, Mode.AVATAR));
+ commentContainer.add(new Label("userName", userIdent.getName()));
commentContainer.add(new Label("action", "commented"));
commentContainer.add(new Label("date", DateUtils.formatAge(getComment().getCreateDate())));
@@ -245,9 +247,9 @@ public abstract class CodeCommentPanel extends Panel {
replyContainer.setMarkupId(reply.getAnchor());
replyContainer.add(AttributeAppender.append("name", reply.getAnchor()));
- User userForDisplay = User.getForDisplay(reply.getUser(), reply.getUserName());
- replyContainer.add(new UserAvatarLink("userAvatar", userForDisplay));
- replyContainer.add(new UserLink("userName", userForDisplay));
+ UserIdent userIdent = UserIdent.of(UserFacade.of(reply.getUser()), reply.getUserName());
+ replyContainer.add(new UserIdentPanel("userAvatar", userIdent, Mode.AVATAR));
+ replyContainer.add(new Label("userName", userIdent.getName()));
replyContainer.add(new Label("action", "replied"));
replyContainer.add(new Label("date", DateUtils.formatAge(reply.getDate())));
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index d32ef11c4e..091c539764 100644
--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -41,7 +41,7 @@ import io.onedev.server.web.component.commit.graph.CommitGraphUtils;
import io.onedev.server.web.component.commit.message.ExpandableCommitMessagePanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.user.avatar.ContributorAvatars;
+import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.util.model.CommitRefsModel;
diff --git a/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java b/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java
index d74ef8ef33..18f8ca6254 100644
--- a/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java
@@ -8,7 +8,9 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.eclipse.jgit.lib.PersonIdent;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public class ContributorPanel extends Panel {
@@ -30,12 +32,12 @@ public class ContributorPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new UserLink("author", author));
+ add(new UserIdentPanel("author", UserIdent.of(author), Mode.NAME));
if (committer.getEmailAddress().equals(author.getEmailAddress())
&& committer.getName().equals(author.getName())) {
add(new WebMarkupContainer("committer").setVisible(false));
} else {
- add(new UserLink("committer", committer));
+ add(new UserIdentPanel("committer", UserIdent.of(committer), Mode.NAME));
}
if (withDate)
add(new Label("date", DateUtils.formatAge(committer.getWhen())));
diff --git a/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java b/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
index 1c20868884..c2ca9dbfbd 100644
--- a/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
@@ -19,10 +19,13 @@ import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.watch.WatchStatus;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.component.user.list.UserListLink;
import io.onedev.server.web.component.watchstatus.WatchStatusLink;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public abstract class EntityWatchesPanel extends Panel {
@@ -78,7 +81,7 @@ public abstract class EntityWatchesPanel extends Panel {
@Override
protected void populateItem(ListItem<EntityWatch> item) {
User user = item.getModelObject().getUser();
- item.add(new UserAvatarLink("watcher", user, user.getDisplayName()));
+ item.add(new UserIdentPanel("watcher", UserIdent.of(UserFacade.of(user)), Mode.AVATAR));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java b/core/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java
index b0b29641a8..d54757b663 100644
--- a/core/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java
@@ -2,10 +2,8 @@ package io.onedev.server.web.component.floating;
import java.util.List;
-import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.request.resource.CssResourceReference;
import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -22,7 +20,6 @@ public class FloatingResourceReference extends BaseDependentResourceReference {
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(FloatingResourceReference.class, "floating.css")));
return dependencies;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/floating/floating.css b/core/src/main/java/io/onedev/server/web/component/floating/floating.css
deleted file mode 100644
index 07e0b0e1ff..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/floating/floating.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.floating {
- background-clip: padding-box;
- background-color: #FFF;
- border: 1px solid rgba(0, 0, 0, 0.2);
- box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
- position: absolute;
- border-radius: 3px;
- z-index: 2000;
-}
-
-/* wicket default ajax lazyload style */
-.floating>.content>div>img[alt="Loading..."] {
- margin: 8px;
-}
-
diff --git a/core/src/main/java/io/onedev/server/web/component/teamchoice/AbstractTeamChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java
similarity index 56%
rename from core/src/main/java/io/onedev/server/web/component/teamchoice/AbstractTeamChoiceProvider.java
rename to core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java
index 75cdde801f..b9a2821cc7 100644
--- a/core/src/main/java/io/onedev/server/web/component/teamchoice/AbstractTeamChoiceProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.teamchoice;
+package io.onedev.server.web.component.groupchoice;
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.TeamFacade;
+import io.onedev.server.util.facade.GroupFacade;
import io.onedev.server.web.component.select2.ChoiceProvider;
-public abstract class AbstractTeamChoiceProvider extends ChoiceProvider<TeamFacade> {
+public abstract class AbstractGroupChoiceProvider extends ChoiceProvider<GroupFacade> {
private static final long serialVersionUID = 1L;
@Override
- public void toJson(TeamFacade choice, JSONWriter writer) throws JSONException {
+ public void toJson(GroupFacade choice, JSONWriter writer) throws JSONException {
writer.key("id").value(choice.getId()).key("name").value(choice.getName());
}
@Override
- public Collection<TeamFacade> toChoices(Collection<String> ids) {
- List<TeamFacade> teams = Lists.newArrayList();
+ public Collection<GroupFacade> toChoices(Collection<String> ids) {
+ List<GroupFacade> groups = Lists.newArrayList();
CacheManager cacheManager = OneDev.getInstance(CacheManager.class);
for (String each : ids) {
Long id = Long.valueOf(each);
- teams.add(cacheManager.getTeam(id));
+ groups.add(cacheManager.getGroup(id));
}
- return teams;
+ return groups;
}
}
\ No newline at end of file
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.java
new file mode 100644
index 0000000000..74ee5beda6
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java
@@ -0,0 +1,39 @@
+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 file
diff --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.java
new file mode 100644
index 0000000000..62b54bbb4c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceResourceReference.java
@@ -0,0 +1,13 @@
+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.java
new file mode 100644
index 0000000000..903039de89
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java
@@ -0,0 +1,37 @@
+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.java
new file mode 100644
index 0000000000..c5cd875ee2
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java
@@ -0,0 +1,41 @@
+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 file
diff --git a/core/src/main/java/io/onedev/server/web/component/teamchoice/team-choice.js b/core/src/main/java/io/onedev/server/web/component/groupchoice/group-choice.js
similarity index 80%
rename from core/src/main/java/io/onedev/server/web/component/teamchoice/team-choice.js
rename to core/src/main/java/io/onedev/server/web/component/groupchoice/group-choice.js
index b066f1fea2..c46cb7b1e8 100644
--- a/core/src/main/java/io/onedev/server/web/component/teamchoice/team-choice.js
+++ b/core/src/main/java/io/onedev/server/web/component/groupchoice/group-choice.js
@@ -1,4 +1,4 @@
-onedev.server.teamChoiceFormatter = {
+onedev.server.groupChoiceFormatter = {
formatSelection: function(group) {
return group.name;
},
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index 908dfa55fd..46cbbcfebe 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -45,13 +45,14 @@ import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueD
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.component.issue.activities.activity.IssueActivity;
import io.onedev.server.web.component.issue.activities.activity.IssueChangeActivity;
import io.onedev.server.web.component.issue.activities.activity.IssueCommentedActivity;
-import io.onedev.server.web.component.issue.activities.activity.IssueActivity;
import io.onedev.server.web.component.issue.activities.activity.IssueOpenedActivity;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.security.LoginPage;
import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
@@ -183,7 +184,7 @@ public abstract class IssueActivitiesPanel extends Panel {
if (anchor != null)
row.setMarkupId(anchor);
- row.add(new UserAvatarLink("avatar", activity.getUser(), activity.getUser()!=null?activity.getUser().getDisplayName():"OneDev"));
+ row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));
row.add(activity.render("content", new DeleteCallback() {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueActivity.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueActivity.java
index e5158e8f98..19644fe25e 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueActivity.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueActivity.java
@@ -7,8 +7,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.markup.html.panel.Panel;
-import io.onedev.server.model.User;
import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.util.userident.UserIdent;
public interface IssueActivity extends Serializable {
@@ -16,7 +16,7 @@ public interface IssueActivity extends Serializable {
Panel render(String panelId, DeleteCallback deleteCallback);
- User getUser();
+ UserIdent getUser();
@Nullable
String getAnchor();
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java
index 1e42c3e630..04ef73a180 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java
@@ -8,8 +8,9 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.User;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public class IssueChangeActivity implements IssueActivity {
@@ -47,8 +48,8 @@ public class IssueChangeActivity implements IssueActivity {
}
@Override
- public User getUser() {
- return User.getForDisplay(getChange().getUser(), getChange().getUserName());
+ public UserIdent getUser() {
+ return UserIdent.of(UserFacade.of(getChange().getUser()), getChange().getUserName());
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
index 7332a97121..aead258b01 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
@@ -5,9 +5,10 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.User;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.SystemUserIdent;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
class IssueChangePanel extends GenericPanel<IssueChange> {
@@ -21,8 +22,8 @@ class IssueChangePanel extends GenericPanel<IssueChange> {
super.onInitialize();
IssueChange change = getModelObject();
- User userForDisplay = User.getForDisplay(change.getUser(), change.getUserName());
- add(new UserLink("user", userForDisplay).setVisible(userForDisplay != null));
+ UserIdent userIdent = UserIdent.of(UserFacade.of(change.getUser()), change.getUserName());
+ add(new Label("user", userIdent.getName()).setVisible(!(userIdent instanceof SystemUserIdent)));
add(new Label("description", change.getData().getDescription()));
add(new Label("age", DateUtils.formatAge(change.getDate())));
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java
index eecb0c1e54..196d5b2f81 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java
@@ -9,8 +9,9 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueCommentManager;
import io.onedev.server.model.IssueComment;
-import io.onedev.server.model.User;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public class IssueCommentedActivity implements IssueActivity {
@@ -59,8 +60,8 @@ public class IssueCommentedActivity implements IssueActivity {
}
@Override
- public User getUser() {
- return User.getForDisplay(getComment().getUser(), getComment().getUserName());
+ public UserIdent getUser() {
+ return UserIdent.of(UserFacade.of(getComment().getUser()), getComment().getUserName());
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
index 103901d587..3530a75177 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
@@ -9,10 +9,10 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueCommentManager;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
@@ -33,7 +33,8 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {
protected void onInitialize() {
super.onInitialize();
- add(new UserLink("user", User.getForDisplay(getComment().getUser(), getComment().getUserName())));
+ UserIdent userIdent = UserIdent.of(UserFacade.of(getComment().getUser()), getComment().getUserName());
+ add(new Label("user", userIdent.getName()));
add(new Label("age", DateUtils.formatAge(getComment().getDate())));
add(new ProjectCommentPanel("body") {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java
index 9fadd99719..30f5ecd017 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java
@@ -8,8 +8,9 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.User;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public class IssueOpenedActivity implements IssueActivity {
@@ -47,8 +48,8 @@ public class IssueOpenedActivity implements IssueActivity {
}
@Override
- public User getUser() {
- return User.getForDisplay(getIssue().getSubmitter(), getIssue().getSubmitterName());
+ public UserIdent getUser() {
+ return UserIdent.of(UserFacade.of(getIssue().getSubmitter()), getIssue().getSubmitterName());
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
index 02136c1378..ab9ca5e9f1 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
@@ -9,10 +9,10 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
@@ -31,7 +31,7 @@ class IssueOpenedPanel extends GenericPanel<Issue> {
super.onInitialize();
Issue issue = getIssue();
- add(new UserLink("user", User.getForDisplay(issue.getSubmitter(), issue.getSubmitterName())));
+ add(new Label("user", UserIdent.of(UserFacade.of(issue.getSubmitter()), issue.getSubmitterName()).getName()));
add(new Label("age", DateUtils.formatAge(issue.getSubmitDate())));
add(new ProjectCommentPanel("body") {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
index 9fbd2c8cbb..703cdc7497 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
@@ -3,10 +3,6 @@
<wicket:fragment wicket:id="nonEmptyValuesFrag">
<div wicket:id="values" class="value"><span wicket:id="value"></span></div>
</wicket:fragment>
- <wicket:fragment wicket:id="userFrag">
- <a wicket:id="avatar" class="avatar"></a>
- <a wicket:id="name" class="name"></a>
- </wicket:fragment>
<wicket:fragment wicket:id="linkFrag">
<a wicket:id="link"><span wicket:id="label"></span></a>
</wicket:fragment>
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index 1562ce1d9d..aa8b278dfb 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -25,20 +25,21 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.IssueField;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.web.component.link.UserLink;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.ComponentContext;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.utils.ColorUtils;
@SuppressWarnings("serial")
@@ -64,11 +65,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
protected void populateItem(ListItem<String> item) {
String value = item.getModelObject();
if (getField().getType().equals(InputSpec.USER)) {
- User user = User.getForDisplay(OneDev.getInstance(UserManager.class).findByName(value), value);
- Fragment userFrag = new Fragment("value", "userFrag", FieldValuesPanel.this);
- userFrag.add(new UserLink("name", user));
- userFrag.add(new UserAvatarLink("avatar", user));
- item.add(userFrag);
+ UserIdent userIdent = UserIdent.of(UserFacade.of(OneDev.getInstance(UserManager.class).findByName(value)), value);
+ item.add(new UserIdentPanel("value", userIdent, Mode.AVATAR_AND_NAME));
} else if (getField().getType().equals(InputSpec.ISSUE)) {
Issue issue = OneDev.getInstance(IssueManager.class).find(project, Long.valueOf(value));
if (issue != null) {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index a7d2ea0c34..621e3732c0 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -3,7 +3,7 @@
<div class="head">
<form wicket:id="query" class="clearable-wrapper">
<div class="input-group no-autofocus">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order issues here"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order issues here">
<span class="input-group-btn">
<button wicket:id="submit" type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>
</span>
@@ -26,10 +26,6 @@
<wicket:fragment wicket:id="linkFrag">
<a wicket:id="link"><span wicket:id="label"></span></a>
</wicket:fragment>
- <wicket:fragment wicket:id="userFrag">
- <a wicket:id="avatar" class="avatar"></a>
- <a wicket:id="name" class="name"></a>
- </wicket:fragment>
<wicket:fragment wicket:id="fieldsFrag">
<form wicket:id="form" class="issue-table-fields leave-confirm no-autofocus">
<div class="modal-header">
@@ -42,7 +38,7 @@
<div wicket:id="editor"></div>
</div>
<div class="modal-footer clearfix">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
</form>
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index f8b27899ba..dfc3e86d30 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -45,12 +45,12 @@ import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.IssueField;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
@@ -58,10 +58,10 @@ import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
-import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
@@ -69,6 +69,7 @@ import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QuerySaveSupport;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.VisibleVisitor;
import io.onedev.utils.StringUtils;
@@ -500,11 +501,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {
public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
IModel<Issue> rowModel) {
Issue issue = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "userFrag", IssueListPanel.this);
- User submitter = User.getForDisplay(issue.getSubmitter(), issue.getSubmitterName());
- fragment.add(new UserAvatarLink("avatar", submitter));
- fragment.add(new UserLink("name", submitter));
- cellItem.add(fragment);
+ UserIdent userIdent = UserIdent.of(UserFacade.of(issue.getSubmitter()), issue.getSubmitterName());
+ cellItem.add(new UserIdentPanel(componentId, userIdent, Mode.AVATAR_AND_NAME));
}
});
break;
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
index f0356fdd1e..c958ca755a 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
@@ -32,8 +32,8 @@ import io.onedev.server.manager.CommitInfoManager;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
-import io.onedev.server.web.component.link.BranchLink;
import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 30695e1d45..67a91840df 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -53,17 +53,20 @@ import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueField;
import io.onedev.server.util.IssueUtils;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.component.milestone.progress.MilestoneProgressBar;
import io.onedev.server.web.component.stringchoice.StringSingleChoice;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.component.user.list.UserListLink;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.page.security.LoginPage;
import io.onedev.server.web.util.QueryPositionSupport;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.ajaxlistener.AppendLoadingIndicatorListener;
@SuppressWarnings("serial")
@@ -383,7 +386,7 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected void populateItem(ListItem<IssueVote> item) {
User user = item.getModelObject().getUser();
- item.add(new UserAvatarLink("voter", user, user.getDisplayName()));
+ item.add(new UserIdentPanel("voter", UserIdent.of(UserFacade.of(user)), Mode.AVATAR));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/link/UserLink.java b/core/src/main/java/io/onedev/server/web/component/link/UserLink.java
deleted file mode 100644
index e19e428c1c..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/link/UserLink.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package io.onedev.server.web.component.link;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.PersonIdent;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.UserManager;
-import io.onedev.server.model.User;
-import io.onedev.server.web.page.user.UserPage;
-import io.onedev.server.web.page.user.UserProfilePage;
-
-@SuppressWarnings("serial")
-public class UserLink extends ViewStateAwarePageLink<Void> {
-
- private final PageParameters params;
-
- private final String name;
-
- public UserLink(String id, @Nullable User user) {
- super(id, UserProfilePage.class);
-
- if (user == null) {
- params = new PageParameters();
- name = OneDev.NAME;
- } else if (user.getId() == null) {
- params = new PageParameters();
- name = user.getDisplayName();
- } else {
- params = UserPage.paramsOf(user);
- name = user.getDisplayName();
- }
- }
-
- public UserLink(String id, PersonIdent person) {
- super(id, UserProfilePage.class);
- User user = OneDev.getInstance(UserManager.class).find(person);
- if (user != null) {
- params = UserPage.paramsOf(user);
- name = user.getDisplayName();
- } else {
- name = person.getName();
- params = new PageParameters();
- }
- }
-
- @Override
- public PageParameters getPageParameters() {
- return params;
- }
-
- @Override
- public IModel<?> getBody() {
- return Model.of(name);
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
-
- configure();
- if (!isEnabled())
- tag.setName("span");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- setEnabled(!params.isEmpty());
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 158b545e73..75b0543105 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -59,6 +59,7 @@ import io.onedev.server.web.component.markdown.emoji.EmojiOnes;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.avatar.AvatarManager;
@SuppressWarnings("serial")
@@ -279,7 +280,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
} else {
userMap.put("searchKey", noSpaceName);
}
- String avatarUrl = avatarManager.getAvatarUrl(user);
+ String avatarUrl = avatarManager.getAvatarUrl(UserIdent.of(user));
userMap.put("avatarUrl", avatarUrl);
userList.add(userMap);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index 861352eeb2..6f3ff7d2cf 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -34,6 +34,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.avatar.AvatarManager;
import io.onedev.utils.ColorUtils;
import io.onedev.utils.StringUtils;
@@ -163,7 +164,7 @@ public class MarkdownViewer extends GenericPanel<String> {
case "user":
User user = OneDev.getInstance(UserManager.class).get(Long.valueOf(referenceId));
if (user != null) {
- String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(user.getFacade());
+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(UserIdent.of(user.getFacade()));
String script = String.format("onedev.server.markdown.renderUserTooltip('%s', '%s', '%s')",
JavaScriptEscape.escapeJavaScript(avatarUrl),
JavaScriptEscape.escapeJavaScript(user.getDisplayName()),
diff --git a/core/src/main/java/io/onedev/server/web/component/link/ProjectLink.java b/core/src/main/java/io/onedev/server/web/component/project/ProjectLink.java
similarity index 86%
rename from core/src/main/java/io/onedev/server/web/component/link/ProjectLink.java
rename to core/src/main/java/io/onedev/server/web/component/project/ProjectLink.java
index 68397eba93..a78603de9f 100644
--- a/core/src/main/java/io/onedev/server/web/component/link/ProjectLink.java
+++ b/core/src/main/java/io/onedev/server/web/component/project/ProjectLink.java
@@ -1,9 +1,10 @@
-package io.onedev.server.web.component.link;
+package io.onedev.server.web.component.project;
import org.apache.wicket.Page;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
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.list.IssueListPage;
diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
index 63fa365912..d50011f6a7 100644
--- a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
@@ -3,9 +3,6 @@
<wicket:fragment wicket:id="projectFrag">
<a wicket:id="link"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a>
</wicket:fragment>
- <wicket:fragment wicket:id="authorFrag">
- <a wicket:id="avatar" class="avatar"></a> <a wicket:id="name" class="name"></a>
- </wicket:fragment>
<wicket:fragment wicket:id="commitMessageFrag">
<a wicket:id="link"><span wicket:id="message"></span></a>
</wicket:fragment>
diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 25dee04e08..a204f908c6 100644
--- a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -36,12 +36,12 @@ import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
-import io.onedev.server.web.component.link.ProjectLink;
-import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.web.component.project.ProjectLink;
import io.onedev.server.web.component.project.avatar.ProjectAvatar;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public class ProjectListPanel extends Panel {
@@ -87,10 +87,8 @@ public class ProjectListPanel extends Panel {
Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId());
RevCommit lastCommit = project.getLastCommit();
if (lastCommit != null) {
- Fragment fragment = new Fragment(componentId, "authorFrag", ProjectListPanel.this);
- fragment.add(new UserAvatarLink("avatar", lastCommit.getAuthorIdent()));
- fragment.add(new UserLink("name", lastCommit.getAuthorIdent()));
- cellItem.add(fragment);
+ UserIdent userIdent = UserIdent.of(lastCommit.getAuthorIdent());
+ cellItem.add(new UserIdentPanel(componentId, userIdent, UserIdentPanel.Mode.AVATAR_AND_NAME));
} else {
cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));
}
diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css b/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css
index 8fa18b252e..d294b2dc25 100644
--- a/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css
+++ b/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css
@@ -5,12 +5,9 @@ table.project-list td.project {
font-size: 14px;
}
-table.project-list a {
- color: #444;
-}
table.project-list td.project, table.project-list td.author {
white-space: nowrap;
}
-table.project-list td.author span, table.project-list td.commit-date {
+table.project-list td.commit-date {
color: #888;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.html b/core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.html
new file mode 100644
index 0000000000..d3f4557dc8
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.html
@@ -0,0 +1,20 @@
+<wicket:panel>
+ <div class="privilege selection">
+ <a wicket:id="issueRead">
+ <div class="title">Issue Read</div>
+ <div class="description">Able to read issues of the project</div>
+ </a>
+ <a wicket:id="codeRead">
+ <div class="title">Code Read</div>
+ <div class="description">Has issue read privilege, and can also pull/read code of the project</div>
+ </a>
+ <a wicket:id="codeWrite">
+ <div class="title">Code Write</div>
+ <div class="description">Has code write privilege, and can also push/write code of the project</div>
+ </a>
+ <a wicket:id="administration">
+ <div class="title">Administration</div>
+ <div class="description">Has code write privilege, and can also administrate the project</div>
+ </a>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.java b/core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.java
new file mode 100644
index 0000000000..ccce19132e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.java
@@ -0,0 +1,89 @@
+package io.onedev.server.web.component.project.privilege.selection;
+
+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.permission.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>("issueRead") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (currentPrivilege == ProjectPrivilege.ISSUE_READ)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, ProjectPrivilege.ISSUE_READ);
+ }
+
+ });
+ add(new AjaxLink<Void>("codeRead") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (currentPrivilege == ProjectPrivilege.CODE_READ)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, ProjectPrivilege.CODE_READ);
+ }
+
+ });
+ add(new AjaxLink<Void>("codeWrite") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (currentPrivilege == ProjectPrivilege.CODE_WRITE)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, ProjectPrivilege.CODE_WRITE);
+ }
+
+ });
+ add(new AjaxLink<Void>("administration") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (currentPrivilege == ProjectPrivilege.ADMINISTRATION)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, ProjectPrivilege.ADMINISTRATION);
+ }
+
+ });
+ }
+
+ protected abstract void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourceCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourceCssResourceReference.java
new file mode 100644
index 0000000000..39d11dcc22
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourceCssResourceReference.java
@@ -0,0 +1,12 @@
+package io.onedev.server.web.component.project.privilege.source;
+
+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/project/privilege/source/PrivilegeSourcePanel.html b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.html
new file mode 100644
index 0000000000..b958f3cec8
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="privilege-source">
+ <b wicket:id="user"></b> has permission <b wicket:id="privilege"></b> on project <b wicket:id="project"></b> as:
+ <ul>
+ <li wicket:id="userIsRoot" class="user-is-root">User is root</li>
+ <li wicket:id="projectHasDefaultPrivilege" class="project-has-default-privilege"></li>
+ <wicket:container wicket:id="groups">
+ <li class="user-is-member-of-group">The user is a member of group <b wicket:id="group"></b></li>
+ </wicket:container>
+ </ul>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java
new file mode 100644
index 0000000000..b04261ed0e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java
@@ -0,0 +1,127 @@
+package io.onedev.server.web.component.project.privilege.source;
+
+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.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 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.permission.DefaultPrivilege;
+import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.utils.WordUtils;
+
+@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", WordUtils.toWords(privilege.name())));
+
+ add(new WebMarkupContainer("userIsRoot").setVisible(user.isRoot()));
+ DefaultPrivilege defaultPrivilege = project.getDefaultPrivilege();
+ if (defaultPrivilege != null && defaultPrivilege.getProjectPrivilege().implies(privilege)) {
+ add(new Label("projectHasDefaultPrivilege",
+ "Project has default permission \"" + WordUtils.toWords(defaultPrivilege.getProjectPrivilege().name()) + "\""));
+ } else {
+ add(new WebMarkupContainer("projectHasDefaultPrivilege").setVisible(false));
+ }
+ 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) {
+ item.add(new Label("group", 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/project/privilege/source/privilege-source.css b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/privilege-source.css
new file mode 100644
index 0000000000..4ad64569e0
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/privilege-source.css
@@ -0,0 +1,12 @@
+.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.html b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.html
index 7927f3be31..ceb999256d 100644
--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.html
@@ -5,7 +5,7 @@
<span wicket:id="result"></span>
</td>
<td class="user">
- <a wicket:id="avatar"></a> <a wicket:id="name"></a>
+ <a wicket:id="user"></a>
</td>
<td class="actions">
<a wicket:id="delete" title="Remove this reviewer"><i class="fa fa-trash"></i></a>
@@ -14,7 +14,7 @@
<wicket:enclosure child="addReviewer">
<tr>
<td class="add-reviewer" colspan="3">
- <input wicket:id="addReviewer" type="hidden" class="form-control"></input>
+ <input wicket:id="addReviewer" type="hidden" class="form-control">
</td>
</tr>
</wicket:enclosure>
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.java
index c512e25f55..92713eb7b4 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
@@ -33,9 +33,10 @@ import io.onedev.server.model.support.pullrequest.ReviewResult;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.JsoupUtils;
import io.onedev.server.util.facade.UserFacade;
-import io.onedev.server.web.behavior.dropdown.DropdownHover;
-import io.onedev.server.web.component.link.UserLink;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
import io.onedev.server.web.websocket.PageDataChanged;
@@ -113,8 +114,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {
@Override
protected void populateItem(ListItem<PullRequestReview> item) {
PullRequestReview review = item.getModelObject();
- item.add(new UserAvatarLink("avatar", review.getUser()));
- item.add(new UserLink("name", review.getUser()));
+ item.add(new UserIdentPanel("user", UserIdent.of(UserFacade.of(review.getUser())), Mode.AVATAR_AND_NAME));
PullRequest request = getPullRequest();
@@ -127,7 +127,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {
} else {
result.add(AttributeAppender.append("class", "awaiting fa fa-clock-o"));
}
- result.add(new DropdownHover() {
+ result.add(new DropdownHoverBehavior() {
@Override
protected Component newContent(String id) {
diff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementAssistBehavior.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementAssistBehavior.java
index eb4bb7459f..9eea68fdb0 100644
--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementAssistBehavior.java
@@ -57,7 +57,7 @@ public class ReviewRequirementAssistBehavior extends ANTLRAssistBehavior {
return SuggestionUtils.suggestUser(project, ProjectPrivilege.CODE_READ,
unfencedMatchWith, ESCAPE_CHARS);
} else {
- return SuggestionUtils.suggestTeam(project, unfencedMatchWith, ESCAPE_CHARS);
+ return SuggestionUtils.suggestGroup(unfencedMatchWith, ESCAPE_CHARS);
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css b/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css
index 5b2f693bbb..809e9d6173 100644
--- a/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css
+++ b/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css
@@ -21,7 +21,7 @@
right: 0;
top: 0;
bottom: 0;
- padding: 20px 0;
+ padding: 10px 0;
overflow: hidden;
margin-bottom: 0;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html
index a48820fa78..21c667a68e 100644
--- a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html
@@ -4,7 +4,7 @@
<div>Possible declarations</div>
<ul class="declarations list-unstyled">
<li wicket:id="declarations">
- <img wicket:id="icon"></img>
+ <img wicket:id="icon">
<a wicket:id="link">
<span wicket:id="label"></span>
<wicket:enclosure child="scope">
diff --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.java
deleted file mode 100644
index 86d065bcd9..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamChoiceProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-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 file
diff --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.java
deleted file mode 100644
index 637b41f7eb..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamChoiceResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-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.java
deleted file mode 100644
index f5b6810f6e..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamMultiChoice.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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.java
deleted file mode 100644
index 5a384e40d5..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/teamchoice/TeamSingleChoice.java
+++ /dev/null
@@ -1,41 +0,0 @@
-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 file
diff --git a/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java
index fcdd58aee0..c79a99c010 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java
@@ -1,16 +1,13 @@
package io.onedev.server.web.component.user.avatar;
-import javax.annotation.Nullable;
-
+import org.apache.wicket.behavior.AttributeAppender;
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.WebComponent;
-import org.eclipse.jgit.lib.PersonIdent;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.UserManager;
-import io.onedev.server.model.User;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.avatar.AvatarManager;
@SuppressWarnings("serial")
@@ -18,21 +15,10 @@ public class UserAvatar extends WebComponent {
private String url;
- public UserAvatar(String id, @Nullable User user) {
+ public UserAvatar(String id, UserIdent userIdent) {
super(id);
- url = getAvatarManager().getAvatarUrl(user!=null?user.getFacade():null);
- }
-
- public UserAvatar(String id, PersonIdent person) {
- super(id);
-
- User user = OneDev.getInstance(UserManager.class).find(person);
- if (user != null) {
- url = getAvatarManager().getAvatarUrl(user.getFacade());
- } else {
- url = getAvatarManager().getAvatarUrl(person);
- }
+ url = getAvatarManager().getAvatarUrl(userIdent);
}
private AvatarManager getAvatarManager() {
@@ -42,6 +28,7 @@ public class UserAvatar extends WebComponent {
@Override
protected void onInitialize() {
super.onInitialize();
+ add(AttributeAppender.append("class", "avatar"));
setOutputMarkupId(true);
}
@@ -56,7 +43,6 @@ public class UserAvatar extends WebComponent {
super.onComponentTag(tag);
tag.setName("img");
- tag.append("class", "avatar", " ");
tag.put("src", url);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarLink.java b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarLink.java
deleted file mode 100644
index 72a6182be7..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarLink.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package io.onedev.server.web.component.user.avatar;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.PersonIdent;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.UserManager;
-import io.onedev.server.model.User;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.page.user.UserPage;
-import io.onedev.server.web.page.user.UserProfilePage;
-import io.onedev.server.web.util.avatar.AvatarManager;
-
-@SuppressWarnings("serial")
-public class UserAvatarLink extends ViewStateAwarePageLink<Void> {
-
- private final PageParameters params;
-
- private final String tooltip;
-
- private String url;
-
- public UserAvatarLink(String id, @Nullable User user) {
- this(id, user, null);
- }
-
- public UserAvatarLink(String id, @Nullable User user, @Nullable String tooltip) {
- super(id, UserProfilePage.class);
-
- AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);
- if (user == null) {
- params = new PageParameters();
- } else if (user.getId() == null) {
- params = new PageParameters();
- } else {
- params = UserPage.paramsOf(user);
- }
- this.tooltip = tooltip;
- url = avatarManager.getAvatarUrl(user!=null?user.getFacade():null);
- }
-
- public UserAvatarLink(String id, PersonIdent person) {
- this(id, person, null);
- }
-
- public UserAvatarLink(String id, PersonIdent person, @Nullable String tooltip) {
- super(id, UserProfilePage.class);
-
- AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);
-
- User user = OneDev.getInstance(UserManager.class).find(person);
- if (user != null) {
- params = UserPage.paramsOf(user);
- url = avatarManager.getAvatarUrl(user.getFacade());
- } else {
- params = new PageParameters();
- url = avatarManager.getAvatarUrl(person);
- }
-
- this.tooltip = tooltip;
- }
-
- @Override
- public PageParameters getPageParameters() {
- return params;
- }
-
- @Override
- public IModel<?> getBody() {
- return Model.of("<img src='" + url + "' class='avatar'></img>");
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- configure();
- if (!isEnabled())
- tag.setName("span");
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new UserAvatarResourceReference()));
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- setEnabled(!params.isEmpty());
- setEscapeModelStrings(false);
-
- if (tooltip != null)
- add(AttributeAppender.append("title", tooltip));
-
- setOutputMarkupId(true);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/avatar/user-avatar.css b/core/src/main/java/io/onedev/server/web/component/user/avatar/user-avatar.css
index 386a77e24b..960944f533 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/avatar/user-avatar.css
+++ b/core/src/main/java/io/onedev/server/web/component/user/avatar/user-avatar.css
@@ -2,18 +2,4 @@ img.avatar {
border-radius: 1000px;
height: 24px;
width: 24px;
-}
-.contributor-avatars {
- position: relative;
-}
-.contributor-avatars .author .avatar {
- height: 36px;
- width: 36px;
-}
-.contributor-avatars .committer .avatar {
- position: absolute;
- height: 16px;
- width: 16px;
- left: 22px;
- top: 13px;
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditCssResourceReference.java
new file mode 100644
index 0000000000..5efc422aee
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.user.avataredit;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class AvatarEditCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public AvatarEditCssResourceReference() {
+ super(AvatarEditCssResourceReference.class, "avatar-edit.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.html b/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.html
similarity index 93%
rename from core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.html
rename to core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.html
index 430e845e75..d3b7bb6425 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.html
+++ b/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.html
@@ -1,4 +1,4 @@
-<wicket:extend>
+<wicket:panel>
<div class="avatar-edit">
<div class="current">
<div class="title">Current avatar</div>
@@ -13,4 +13,4 @@
</form>
</div>
</div>
-</wicket:extend>
\ No newline at end of file
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java b/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java
similarity index 67%
rename from core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java
rename to core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java
index acad072476..2a60c913ba 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java
@@ -1,37 +1,46 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.component.user.avataredit;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.model.User;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.avatarupload.AvatarFileSelected;
import io.onedev.server.web.component.avatarupload.AvatarUploadField;
import io.onedev.server.web.component.user.avatar.UserAvatar;
import io.onedev.server.web.util.avatar.AvatarManager;
@SuppressWarnings("serial")
-public class AvatarEditPage extends UserPage {
+public class AvatarEditPanel extends GenericPanel<User> {
private String uploadedAvatarData;
- public AvatarEditPage(PageParameters params) {
- super(params);
+ public AvatarEditPanel(String id, IModel<User> model) {
+ super(id, model);
}
private AvatarManager getAvatarManager() {
return OneDev.getInstance(AvatarManager.class);
}
+ private User getUser() {
+ return getModelObject();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
- add(new UserAvatar("avatar", getUser()));
+ add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(getUser()))));
add(new Link<Void>("useDefault") {
@@ -44,7 +53,7 @@ public class AvatarEditPage extends UserPage {
@Override
public void onClick() {
getAvatarManager().useAvatar(getUser().getFacade(), null);
- setResponsePage(AvatarEditPage.class, AvatarEditPage.paramsOf(getUser()));
+ setResponsePage(getPage().getClass(), getPage().getPageParameters());
}
});
@@ -59,7 +68,7 @@ public class AvatarEditPage extends UserPage {
super.onSubmit();
AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);
avatarManager.useAvatar(getUser().getFacade(), uploadedAvatarData);
- setResponsePage(AvatarEditPage.class, AvatarEditPage.paramsOf(getUser()));
+ setResponsePage(getPage().getClass(), getPage().getPageParameters());
}
@Override
@@ -79,10 +88,11 @@ public class AvatarEditPage extends UserPage {
add(form);
}
-
+
@Override
- protected boolean isPermitted() {
- return SecurityUtils.canAdministrate(getUser().getFacade());
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new AvatarEditCssResourceReference()));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/avataredit/avatar-edit.css b/core/src/main/java/io/onedev/server/web/component/user/avataredit/avatar-edit.css
new file mode 100644
index 0000000000..cc541493e7
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/avataredit/avatar-edit.css
@@ -0,0 +1,21 @@
+.avatar-edit .title {
+ margin-bottom: 20px;
+ font-size: 18px;
+ font-weight: bold;
+}
+.avatar-edit>.current {
+ margin-bottom: 20px;
+ padding-bottom: 20px;
+ border-bottom: 1px solid #E8E8E8;
+}
+.avatar-edit .current img {
+ height: 240px;
+ width: 240px;
+ display: block;
+}
+.avatar-edit .current a {
+ margin-top: 20px;
+}
+.avatar-edit form>button {
+ margin-top: 20px;
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java
index dab9d1dd51..e1a64c435d 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java
@@ -12,6 +12,7 @@ import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.select2.ChoiceProvider;
import io.onedev.server.web.util.avatar.AvatarManager;
@@ -22,7 +23,7 @@ public abstract class AbstractUserChoiceProvider extends ChoiceProvider<UserFaca
@Override
public void toJson(UserFacade choice, JSONWriter writer) throws JSONException {
writer.key("id").value(choice.getId()).key("name").value(HtmlEscape.escapeHtml5(choice.getDisplayName()));
- String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(choice);
+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(UserIdent.of(choice));
writer.key("avatar").value(avatarUrl);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/avatar/ContributorAvatars.html b/core/src/main/java/io/onedev/server/web/component/user/contributoravatars/ContributorAvatars.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/component/user/avatar/ContributorAvatars.html
rename to core/src/main/java/io/onedev/server/web/component/user/contributoravatars/ContributorAvatars.html
diff --git a/core/src/main/java/io/onedev/server/web/component/user/avatar/ContributorAvatars.java b/core/src/main/java/io/onedev/server/web/component/user/contributoravatars/ContributorAvatars.java
similarity index 64%
rename from core/src/main/java/io/onedev/server/web/component/user/avatar/ContributorAvatars.java
rename to core/src/main/java/io/onedev/server/web/component/user/contributoravatars/ContributorAvatars.java
index 127a2a9b6b..b01a3f81af 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/avatar/ContributorAvatars.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/contributoravatars/ContributorAvatars.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.user.avatar;
+package io.onedev.server.web.component.user.contributoravatars;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -6,6 +6,10 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.eclipse.jgit.lib.PersonIdent;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
+
@SuppressWarnings("serial")
public class ContributorAvatars extends Panel {
@@ -23,19 +27,19 @@ public class ContributorAvatars extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new UserAvatarLink("author", author));
+ add(new UserIdentPanel("author", UserIdent.of(author, "Git author"), Mode.AVATAR));
if (committer.getEmailAddress().equals(author.getEmailAddress())
&& committer.getName().equals(author.getName())) {
add(new WebMarkupContainer("committer").setVisible(false));
} else {
- add(new UserAvatarLink("committer", committer));
+ add(new UserIdentPanel("committer", UserIdent.of(committer, "Git committer"), Mode.AVATAR));
}
}
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new UserAvatarResourceReference()));
+ response.render(CssHeaderItem.forReference(new ContributorAvatarsResourceReference()));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/contributoravatars/ContributorAvatarsResourceReference.java b/core/src/main/java/io/onedev/server/web/component/user/contributoravatars/ContributorAvatarsResourceReference.java
new file mode 100644
index 0000000000..0ebb27c378
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/contributoravatars/ContributorAvatarsResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.user.contributoravatars;
+
+import org.apache.wicket.request.resource.CssResourceReference;
+
+public class ContributorAvatarsResourceReference extends CssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public ContributorAvatarsResourceReference() {
+ super(ContributorAvatarsResourceReference.class, "contributor-avatars.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/contributoravatars/contributor-avatars.css b/core/src/main/java/io/onedev/server/web/component/user/contributoravatars/contributor-avatars.css
new file mode 100644
index 0000000000..c633dedb55
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/contributoravatars/contributor-avatars.css
@@ -0,0 +1,14 @@
+.contributor-avatars {
+ position: relative;
+}
+.contributor-avatars .author .avatar {
+ height: 36px;
+ width: 36px;
+}
+.contributor-avatars .committer .avatar {
+ position: absolute;
+ height: 16px;
+ width: 16px;
+ left: 22px;
+ top: 13px;
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailCssResourceReference.java
new file mode 100644
index 0000000000..0d45ea98b4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.user.detail;
+
+import org.apache.wicket.request.resource.CssResourceReference;
+
+public class UserDetailCssResourceReference extends CssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public UserDetailCssResourceReference() {
+ super(UserDetailCssResourceReference.class, "user-detail.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailPanel.html b/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailPanel.html
new file mode 100644
index 0000000000..429e464a5e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailPanel.html
@@ -0,0 +1,26 @@
+<wicket:panel>
+ <wicket:container wicket:id="content"></wicket:container>
+ <wicket:fragment wicket:id="gitUserFrag">
+ <div class="user-detail git-user">
+ <div class="avatar">
+ <img wicket:id="avatar">
+ </div>
+ <div class="other">
+ <div wicket:id="gitName" class="git-name"></div>
+ <div wicket:id="onedevName" class="onedev-name"></div>
+ <div class="email"><a wicket:id="email"></a></div>
+ </div>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="nonGitUserFrag">
+ <div class="user-detail non-git-user">
+ <div class="avatar">
+ <img wicket:id="avatar">
+ </div>
+ <div class="other">
+ <div wicket:id="name" class="name"></div>
+ <div class="email"><a wicket:id="email"></a></div>
+ </div>
+ </div>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailPanel.java b/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailPanel.java
new file mode 100644
index 0000000000..b9dced7976
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailPanel.java
@@ -0,0 +1,84 @@
+package io.onedev.server.web.component.user.detail;
+
+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.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+import org.unbescape.html.HtmlEscape;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.UserManager;
+import io.onedev.server.model.User;
+import io.onedev.server.util.userident.GitUserIdent;
+import io.onedev.server.util.userident.OrdinaryUserIdent;
+import io.onedev.server.util.userident.SystemUserIdent;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.server.web.component.link.EmailLink;
+import io.onedev.server.web.component.user.avatar.UserAvatar;
+
+@SuppressWarnings("serial")
+public class UserDetailPanel extends Panel {
+
+ private final UserIdent userIdent;
+
+ public UserDetailPanel(String id, UserIdent userIdent) {
+ super(id);
+ Preconditions.checkArgument(!(userIdent instanceof SystemUserIdent));
+ this.userIdent = userIdent;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ if (userIdent instanceof GitUserIdent) {
+ GitUserIdent gitUserIdent = (GitUserIdent) userIdent;
+ Fragment fragment = new Fragment("content", "gitUserFrag", this);
+ fragment.add(new UserAvatar("avatar", userIdent));
+
+ String label = HtmlEscape.escapeHtml5(userIdent.getName()) + " <i>(" + gitUserIdent.getGitRole() + ")</i>";
+ fragment.add(new Label("gitName", label).setEscapeModelStrings(false));
+
+ User user = OneDev.getInstance(UserManager.class).findByEmail(gitUserIdent.getEmail());
+ if (user != null) {
+ label = HtmlEscape.escapeHtml5(user.getDisplayName()) + " <i>(Name in OneDev)</i>";
+ fragment.add(new Label("onedevName", label).setEscapeModelStrings(false));
+ } else {
+ fragment.add(new Label("onedevName", "<i>No OneDev account</i>").setEscapeModelStrings(false));
+ }
+ fragment.add(new EmailLink("email", Model.of(gitUserIdent.getEmail())));
+ add(fragment);
+ } else {
+ Fragment fragment = new Fragment("content", "nonGitUserFrag", this);
+ fragment.add(new UserAvatar("avatar", userIdent));
+ if (userIdent instanceof OrdinaryUserIdent) {
+ fragment.add(new Label("name", userIdent.getName()));
+ fragment.add(new EmailLink("email", Model.of(((OrdinaryUserIdent)userIdent).getEmail())));
+ } else {
+ fragment.add(new Label("name", userIdent.getName()).setEscapeModelStrings(false));
+ fragment.add(new Label("email", "<i>Account is removed</i>") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ }.setEscapeModelStrings(false));
+ }
+ add(fragment);
+ }
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new UserDetailCssResourceReference()));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/detail/user-detail.css b/core/src/main/java/io/onedev/server/web/component/user/detail/user-detail.css
new file mode 100644
index 0000000000..48962edb41
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/detail/user-detail.css
@@ -0,0 +1,26 @@
+.user-detail {
+ position: relative;
+ font-size: 16px;
+ padding: 12px;
+ line-height: 22px;
+}
+.user-detail.non-git-user .other {
+ padding: 8px 12px 12px 80px;
+}
+.user-detail.git-user .other {
+ padding: 8px 12px 12px 104px;
+}
+.user-detail.non-git-user img {
+ position: absolute;
+ width: 64px;
+ height: 64px;
+}
+.user-detail.git-user img {
+ position: absolute;
+ width: 90px;
+ height: 90px;
+}
+.user-detail i {
+ color: #888;
+ font-size: 14px;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentCssResourceReference.java
new file mode 100644
index 0000000000..d4444cf0e3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.user.ident;
+
+import org.apache.wicket.request.resource.CssResourceReference;
+
+public class UserIdentCssResourceReference extends CssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public UserIdentCssResourceReference() {
+ super(UserIdentCssResourceReference.class, "user-ident.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.html b/core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.html
new file mode 100644
index 0000000000..e64f812c16
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <img wicket:id="avatar"> <span wicket:id="name" class="name"></span>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java b/core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java
new file mode 100644
index 0000000000..3e8efe43f0
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java
@@ -0,0 +1,70 @@
+package io.onedev.server.web.component.user.ident;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.AttributeAppender;
+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.panel.Panel;
+
+import io.onedev.server.util.userident.SystemUserIdent;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;
+import io.onedev.server.web.component.floating.AlignPlacement;
+import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.detail.UserDetailPanel;
+
+@SuppressWarnings("serial")
+public class UserIdentPanel extends Panel {
+
+ public enum Mode {AVATAR, NAME, AVATAR_AND_NAME};
+
+ private final UserIdent userIdent;
+
+ private final Mode mode;
+
+ public UserIdentPanel(String id, UserIdent userIdent, Mode mode) {
+ super(id);
+ this.userIdent = userIdent;
+ this.mode = mode;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new UserAvatar("avatar", userIdent).setVisible(mode != Mode.NAME));
+
+ add(new Label("name", userIdent.getName()).setVisible(mode != Mode.AVATAR));
+
+ add(AttributeAppender.append("class", "user"));
+
+ if (!(userIdent instanceof SystemUserIdent)) {
+ add(new DropdownHoverBehavior(AlignPlacement.top(8), 350) {
+
+ @Override
+ protected Component newContent(String id) {
+ return new UserDetailPanel(id, userIdent);
+ }
+
+ });
+ }
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (userIdent instanceof SystemUserIdent)
+ tag.setName("span");
+ else
+ tag.setName("a");
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new UserIdentCssResourceReference()));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/ident/user-ident.css b/core/src/main/java/io/onedev/server/web/component/user/ident/user-ident.css
new file mode 100644
index 0000000000..22f49cf6e8
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/ident/user-ident.css
@@ -0,0 +1,3 @@
+a.user:hover, a.user:focus {
+ text-decoration: none;
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.java b/core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.java
index be53b2d903..7bf3f3c51f 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.java
@@ -9,8 +9,10 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
import io.onedev.server.model.User;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.component.user.avatar.UserAvatar;
-import io.onedev.server.web.page.user.UserProfilePage;
+import io.onedev.server.web.page.admin.user.UserProfilePage;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
abstract class UserListPanel extends Panel {
@@ -27,7 +29,7 @@ abstract class UserListPanel extends Panel {
for (User user: getUsers()) {
Link<Void> link = new BookmarkablePageLink<Void>(usersView.newChildId(),
UserProfilePage.class, UserProfilePage.paramsOf(user));
- link.add(new UserAvatar("avatar", user));
+ link.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(user))));
link.add(new Label("name", user.getDisplayName()));
usersView.add(link);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/user/PasswordEditBean.java b/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java
similarity index 86%
rename from core/src/main/java/io/onedev/server/web/page/user/PasswordEditBean.java
rename to core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java
index 149463b823..3a5062be5e 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/PasswordEditBean.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java
@@ -1,9 +1,10 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.component.user.passwordedit;
import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.util.validation.annotation.CurrentPassword;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Password;
diff --git a/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.html b/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.html
similarity index 83%
rename from core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.html
rename to core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.html
index 1c7af283f6..01ef0435fc 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.html
+++ b/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.html
@@ -1,12 +1,12 @@
-<wicket:extend>
+<wicket:panel>
<div class="password-edit">
<div class="body">
<form wicket:id="form" class="leave-confirm" autocomplete="off">
<div wicket:id="editor"></div>
<div class="actions">
- <input type="submit" class="btn btn-primary dirty-aware" value="Change"></input>
+ <input type="submit" class="btn btn-primary dirty-aware" value="Change">
</div>
</form>
</div>
</div>
-</wicket:extend>
\ No newline at end of file
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java b/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java
similarity index 73%
rename from core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java
rename to core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java
index 83d93d12f0..990d1ac048 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.component.user.passwordedit;
import java.util.HashSet;
import java.util.Set;
@@ -6,21 +6,27 @@ import java.util.Set;
import org.apache.shiro.authc.credential.PasswordService;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
import io.onedev.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.manager.UserManager;
+import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
@SuppressWarnings("serial")
-public class PasswordEditPage extends UserPage {
+public class PasswordEditPanel extends GenericPanel<User> {
- public PasswordEditPage(PageParameters params) {
- super(params);
+ public PasswordEditPanel(String id, IModel<User> model) {
+ super(id, model);
}
+ private User getUser() {
+ return getModelObject();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -43,7 +49,8 @@ public class PasswordEditPage extends UserPage {
Session.get().success("Password has been changed");
bean.setOldPassword(null);
- replace(BeanContext.editBean("editor", bean, excludedProperties, true));
+
+ setResponsePage(getPage().getClass(), getPage().getPageParameters());
}
};
@@ -52,9 +59,4 @@ public class PasswordEditPage extends UserPage {
form.add(BeanContext.editBean("editor", bean, excludedProperties, true));
}
- @Override
- protected boolean isPermitted() {
- return SecurityUtils.canAdministrate(getUser().getFacade());
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html
new file mode 100644
index 0000000000..dfba9da7c3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html
@@ -0,0 +1,9 @@
+<wicket:panel>
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor"></div>
+ <div class="actions clearfix">
+ <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit">
+ <a wicket:id="delete" class="btn btn-danger pull-right">Delete</a>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
new file mode 100644
index 0000000000..c6a1b71207
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
@@ -0,0 +1,109 @@
+package io.onedev.server.web.component.user.profileedit;
+
+import java.io.Serializable;
+
+import org.apache.wicket.Session;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+
+import com.google.common.collect.Sets;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.UserManager;
+import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
+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.admin.user.UserListPage;
+import io.onedev.server.web.util.ConfirmOnClick;
+
+@SuppressWarnings("serial")
+public class ProfileEditPanel extends GenericPanel<User> {
+
+ private BeanEditor editor;
+
+ private String oldName;
+
+ public ProfileEditPanel(String id, IModel<User> model) {
+ super(id, model);
+ }
+
+ private User getUser() {
+ return getModelObject();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ editor = BeanContext.editModel("editor", new IModel<Serializable>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Serializable getObject() {
+ return getUser();
+ }
+
+ @Override
+ public void setObject(Serializable object) {
+ // check contract of UserManager.save on why we assign oldName here
+ oldName = getUser().getName();
+ editor.getBeanDescriptor().copyProperties(object, getUser());
+ }
+
+ }, Sets.newHashSet("password"), true);
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+
+ User user = getUser();
+ UserManager userManager = OneDev.getInstance(UserManager.class);
+ User userWithSameName = userManager.findByName(user.getName());
+ if (userWithSameName != null && !userWithSameName.equals(user)) {
+ editor.getErrorContext(new PathSegment.Property("name"))
+ .addError("This name has already been used by another user.");
+ }
+ User userWithSameEmail = userManager.findByEmail(user.getEmail());
+ if (userWithSameEmail != null && !userWithSameEmail.equals(user)) {
+ editor.getErrorContext(new PathSegment.Property("email"))
+ .addError("This email has already been used by another user.");
+ }
+ if (!editor.hasErrors(true)) {
+ userManager.save(user, oldName);
+ Session.get().success("Profile updated");
+ setResponsePage(getPage().getClass(), getPage().getPageParameters());
+ }
+ }
+
+ };
+ form.add(editor);
+
+ form.add(new Link<Void>("delete") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ setVisible(!getUser().equals(SecurityUtils.getUser()));
+ }
+
+ @Override
+ public void onClick() {
+ OneDev.getInstance(UserManager.class).delete(getUser());
+ setResponsePage(UserListPage.class);
+ }
+
+ }.add(new ConfirmOnClick("Do you really want to delete user '" + getUser().getDisplayName() + "'?")));
+
+ add(form);
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/user/TokenGenerateBean.java b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateBean.java
similarity index 82%
rename from core/src/main/java/io/onedev/server/web/page/user/TokenGenerateBean.java
rename to core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateBean.java
index fef3640757..9bc6f76a09 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/TokenGenerateBean.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateBean.java
@@ -1,9 +1,10 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.component.user.tokengenerate;
import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.util.validation.annotation.CurrentPassword;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Password;
diff --git a/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateCssResourceReference.java
new file mode 100644
index 0000000000..2f3bf3d65d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.user.tokengenerate;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class TokenGenerateCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public TokenGenerateCssResourceReference() {
+ super(TokenGenerateCssResourceReference.class, "token-generate.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.html b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.html
similarity index 92%
rename from core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.html
rename to core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.html
index 908762a14d..d6a1b552d0 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.html
+++ b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.html
@@ -1,4 +1,4 @@
-<wicket:extend>
+<wicket:panel>
<div class="token-generate">
<div class="body">
<div class="alert alert-info">Access token can be used to provide access to OneDev in some third-party
@@ -6,7 +6,7 @@
<form wicket:id="form" class="leave-confirm" autocomplete="off">
<div wicket:id="editor"></div>
<div class="actions">
- <input type="submit" class="btn btn-primary dirty-aware" value="Display"></input>
+ <input type="submit" class="btn btn-primary dirty-aware" value="Display">
</div>
</form>
<wicket:enclosure child="token">
@@ -16,4 +16,4 @@
</wicket:enclosure>
</div>
</div>
-</wicket:extend>
\ No newline at end of file
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.java
similarity index 67%
rename from core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java
rename to core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.java
index da3ef0ea75..e7a662431e 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.java
@@ -1,25 +1,32 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.component.user.tokengenerate;
import org.apache.shiro.codec.Base64;
+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.form.Form;
+import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.model.IModel;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.model.User;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.editable.BeanContext;
@SuppressWarnings("serial")
-public class TokenGeneratePage extends UserPage {
+public class TokenGeneratePanel extends GenericPanel<User> {
private String token;
- public TokenGeneratePage(PageParameters params) {
- super(params);
+ public TokenGeneratePanel(String id, IModel<User> model) {
+ super(id, model);
}
+ private User getUser() {
+ return getModelObject();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -68,10 +75,11 @@ public class TokenGeneratePage extends UserPage {
})));
}
-
+
@Override
- protected boolean isPermitted() {
- return SecurityUtils.canAdministrate(getUser().getFacade());
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new TokenGenerateCssResourceReference()));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/token-generate.css b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/token-generate.css
new file mode 100644
index 0000000000..aa743a4dbe
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/token-generate.css
@@ -0,0 +1,7 @@
+.token-generate .token-value {
+ margin-top: 20px;
+}
+.token-generate .token-value a {
+ color: #444;
+ margin-left: 4px;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/TeamChoice.java b/core/src/main/java/io/onedev/server/web/editable/annotation/GroupChoice.java
similarity index 90%
rename from core/src/main/java/io/onedev/server/web/editable/annotation/TeamChoice.java
rename to core/src/main/java/io/onedev/server/web/editable/annotation/GroupChoice.java
index 8e6a004267..a8d702839b 100644
--- a/core/src/main/java/io/onedev/server/web/editable/annotation/TeamChoice.java
+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/GroupChoice.java
@@ -7,6 +7,6 @@ import java.lang.annotation.Target;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
-public @interface TeamChoice {
+public @interface GroupChoice {
String value() default "";
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java
similarity index 88%
rename from core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamEditSupport.java
rename to core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java
index 0a2752ce31..3dcc691ccd 100644
--- a/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.teamchoice;
+package io.onedev.server.web.editable.groupchoice;
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.TeamChoice;
+import io.onedev.server.web.editable.annotation.GroupChoice;
@SuppressWarnings("serial")
-public class TeamEditSupport implements EditSupport {
+public class GroupEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
Method propertyGetter = descriptor.getPropertyGetter();
- if (propertyGetter.getAnnotation(TeamChoice.class) != null) {
+ if (propertyGetter.getAnnotation(GroupChoice.class) != null) {
if (Collection.class.isAssignableFrom(propertyGetter.getReturnType())
&& EditableUtils.getElementClass(propertyGetter.getGenericReturnType()) == String.class) {
return new PropertyContext<Collection<String>>(descriptor) {
@@ -47,7 +47,7 @@ public class TeamEditSupport implements EditSupport {
@Override
public PropertyEditor<Collection<String>> renderForEdit(String componentId, IModel<Collection<String>> model) {
- return new TeamMultiChoiceEditor(componentId, descriptor, model);
+ return new GroupMultiChoiceEditor(componentId, descriptor, model);
}
};
@@ -73,7 +73,7 @@ public class TeamEditSupport implements EditSupport {
@Override
public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- return new TeamSingleChoiceEditor(componentId, descriptor, model);
+ return new GroupSingleChoiceEditor(componentId, descriptor, model);
}
};
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/groupchoice/GroupMultiChoiceEditor.html
new file mode 100644
index 0000000000..3817227265
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <input wicket:id="input" type="hidden">
+</wicket:panel>
\ No newline at end of file
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.java
new file mode 100644
index 0000000000..38aef7894b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java
@@ -0,0 +1,107 @@
+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.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.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();
+
+ List<GroupFacade> groups = new ArrayList<>();
+ 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());
+ }
+
+ 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/teamchoice/TeamSingleChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamSingleChoiceEditor.html
rename to core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.html
diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
new file mode 100644
index 0000000000..43725f6fdc
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
@@ -0,0 +1,106 @@
+package io.onedev.server.web.editable.groupchoice;
+
+import java.util.ArrayList;
+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.facade.GroupFacade;
+import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;
+import io.onedev.server.web.component.groupchoice.GroupSingleChoice;
+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.utils.ReflectionUtils;
+
+@SuppressWarnings("serial")
+public class GroupSingleChoiceEditor extends PropertyEditor<String> {
+
+ private final List<GroupFacade> choices = new ArrayList<>();
+
+ private GroupSingleChoice input;
+
+ public GroupSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ GroupFacade facade;
+
+ 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());
+ }
+
+ Group group;
+ if (getModelObject() != null)
+ group = OneDev.getInstance(GroupManager.class).find(getModelObject());
+ else
+ group = null;
+
+ if (group != null && choices.contains(group.getFacade()))
+ facade = group.getFacade();
+ else
+ facade = null;
+
+ input = new GroupSingleChoice("input", Model.of(facade), new GroupChoiceProvider(choices)) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().configurePlaceholder(descriptor, this);
+ }
+
+ };
+ input.setConvertEmptyInputStringToNull(true);
+
+ // add this to control allowClear flag of select2
+ 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 String convertInputToValue() throws ConversionException {
+ GroupFacade group = input.getConvertedInput();
+ if (group != null)
+ return group.getName();
+ else
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html
index 1b6893780c..4e1cf34a3b 100644
--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html
@@ -1,5 +1,5 @@
<wicket:panel>
<div class="clearable-wrapper">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control">
</div>
</wicket:panel>
\ No newline at end of file
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.java
index 55222e7d86..10cd140fec 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,7 +14,7 @@ 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.TeamChoice;
+import io.onedev.server.web.editable.annotation.GroupChoice;
import io.onedev.server.web.editable.annotation.IssueQuery;
import io.onedev.server.web.editable.annotation.Markdown;
import io.onedev.server.web.editable.annotation.Multiline;
@@ -40,7 +40,7 @@ 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(TeamChoice.class) == null
+ && descriptor.getPropertyGetter().getAnnotation(GroupChoice.class) == null
&& descriptor.getPropertyGetter().getAnnotation(UserChoice.class) == null
&& descriptor.getPropertyGetter().getAnnotation(PathPattern.class) == null
&& descriptor.getPropertyGetter().getAnnotation(ReviewRequirement.class) == null) {
diff --git a/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamMultiChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamMultiChoiceEditor.html
deleted file mode 100644
index f1c90cbe9e..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamMultiChoiceEditor.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<wicket:panel>
- <input wicket:id="input" type="hidden"></input>
-</wicket:panel>
\ No newline at end of file
diff --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.java
deleted file mode 100644
index 8f2eea121a..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamMultiChoiceEditor.java
+++ /dev/null
@@ -1,121 +0,0 @@
-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/teamchoice/TeamSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamSingleChoiceEditor.java
deleted file mode 100644
index 031fc7a3de..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/teamchoice/TeamSingleChoiceEditor.java
+++ /dev/null
@@ -1,120 +0,0 @@
-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;
-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.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.TeamChoice;
-import io.onedev.server.web.util.ComponentContext;
-import io.onedev.utils.ReflectionUtils;
-
-@SuppressWarnings("serial")
-public class TeamSingleChoiceEditor extends PropertyEditor<String> {
-
- private final List<TeamFacade> choices = new ArrayList<>();
-
- private TeamSingleChoice input;
-
- public TeamSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- TeamFacade facade;
-
- OneContext oneContext = new ComponentContext(this);
- 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();
- }
-
- 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();
- }
-
- input = new TeamSingleChoice("input", Model.of(facade), new TeamChoiceProvider(choices)) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- getSettings().configurePlaceholder(descriptor, this);
- }
-
- };
- input.setConvertEmptyInputStringToNull(true);
-
- // add this to control allowClear flag of select2
- 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 String convertInputToValue() throws ConversionException {
- TeamFacade team = input.getConvertedInput();
- if (team != null)
- return team.getName();
- else
- return null;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
index c730470836..6bffb2024c 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
@@ -12,12 +12,18 @@ import io.onedev.server.web.component.tabbable.PageTab;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
+import io.onedev.server.web.page.admin.group.GroupListPage;
+import io.onedev.server.web.page.admin.group.GroupPage;
+import io.onedev.server.web.page.admin.group.NewGroupPage;
import io.onedev.server.web.page.admin.licensemanagement.LicenseManagementPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
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.admin.user.NewUserPage;
+import io.onedev.server.web.page.admin.user.UserListPage;
+import io.onedev.server.web.page.admin.user.UserPage;
import io.onedev.server.web.page.layout.LayoutPage;
@SuppressWarnings("serial")
@@ -37,6 +43,8 @@ public abstract class AdministrationPage extends LayoutPage {
@Override
protected List<? extends Tab> newTabs() {
List<PageTab> tabs = new ArrayList<>();
+ tabs.add(new AdministrationTab("User Management", "fa fa-fw fa-user", UserListPage.class, NewUserPage.class, UserPage.class));
+ tabs.add(new AdministrationTab("Group Management", "fa fa-fw fa-group", GroupListPage.class, NewGroupPage.class, GroupPage.class));
tabs.add(new AdministrationTab("System Setting", "fa fa-fw fa-sliders", SystemSettingPage.class));
tabs.add(new AdministrationTab("Security Setting", "fa fa-fw fa-lock", SecuritySettingPage.class));
tabs.add(new AdministrationTab("External Authentication", "fa fa-fw fa-key", AuthenticatorPage.class));
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationTab.java b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationTab.java
index f65ad17de7..a50780fd05 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationTab.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationTab.java
@@ -23,6 +23,13 @@ public class AdministrationTab extends PageTab {
this.iconClass = iconClass;
}
+ public AdministrationTab(String title, String iconClass, Class<? extends AdministrationPage> mainPageClass,
+ Class<? extends AdministrationPage> additionalPageClass1, Class<? extends AdministrationPage> additionalPageClass2) {
+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);
+
+ this.iconClass = iconClass;
+ }
+
@Override
public Component render(String componentId) {
return new AdministrationTabLink(componentId, this);
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.java
index 3696a457cb..3fba7437e2 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.getTeamFQNs() != null) {
+ if (authenticated.getGroupNames() != null) {
retrievedInfoBuilder.append("Groups: ")
- .append(Joiner.on(", ").join(authenticated.getTeamFQNs()))
+ .append(Joiner.on(", ").join(authenticated.getGroupNames()))
.append("\n");
}
StringBuilder messageBuilder =
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.html
new file mode 100644
index 0000000000..9440edc6b5
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.html
@@ -0,0 +1,22 @@
+<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 file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java
new file mode 100644
index 0000000000..c6e4488ef3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java
@@ -0,0 +1,309 @@
+package io.onedev.server.web.page.admin.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.permission.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.project.choice.AbstractProjectChoiceProvider;
+import io.onedev.server.web.component.project.choice.ProjectChoiceResourceReference;
+import io.onedev.server.web.component.project.privilege.selection.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.WordUtils;
+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 WordUtils.toWords(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).query(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/admin/group/GroupCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupCssResourceReference.java
new file mode 100644
index 0000000000..75277258e4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.admin.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/admin/group/GroupListPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
new file mode 100644
index 0000000000..3f675f3446
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
@@ -0,0 +1,22 @@
+<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/project/setting/team/TeamListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
similarity index 51%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.java
rename to core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
index 6bd023a44c..1f9ae27865 100644
--- 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/admin/group/GroupListPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.setting.team;
+package io.onedev.server.web.page.admin.group;
import java.util.ArrayList;
import java.util.Iterator;
@@ -15,7 +15,6 @@ 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;
@@ -28,34 +27,29 @@ 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.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.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
-import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
-import io.onedev.server.web.page.project.setting.ProjectSettingPage;
+import io.onedev.server.web.component.link.LabelLink;
+import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.PagingHistorySupport;
@SuppressWarnings("serial")
-public class TeamListPage extends ProjectSettingPage {
+public class GroupListPage extends AdministrationPage {
private static final String PARAM_CURRENT_PAGE = "currentPage";
- private DataTable<Team, Void> teamsTable;
+ private DataTable<Group, Void> groupsTable;
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()));
+ private EntityCriteria<Group> getCriteria() {
+ EntityCriteria<Group> criteria = EntityCriteria.of(Group.class);
if (searchInput != null)
criteria.add(Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE));
return criteria;
@@ -66,13 +60,13 @@ public class TeamListPage extends ProjectSettingPage {
super.onInitialize();
TextField<String> searchField;
- add(searchField = new TextField<String>("filterTeams", Model.of("")));
+ add(searchField = new TextField<String>("filterGroups", Model.of("")));
searchField.add(new OnTypingDoneBehavior(100) {
@Override
protected void onTypingDone(AjaxRequestTarget target) {
searchInput = searchField.getInput();
- target.add(teamsTable);
+ target.add(groupsTable);
}
});
@@ -81,62 +75,80 @@ public class TeamListPage extends ProjectSettingPage {
@Override
public void onClick() {
- setResponsePage(NewTeamPage.class, NewTeamPage.paramsOf(getProject()));
+ setResponsePage(NewGroupPage.class);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.isAdministrator());
}
});
- List<IColumn<Team, Void>> columns = new ArrayList<>();
+ List<IColumn<Group, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<Team, Void>(Model.of("Name")) {
+ columns.add(new AbstractColumn<Group, 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);
+ 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<Team, Void>(Model.of("Privilege")) {
+ columns.add(new AbstractColumn<Group, Void>(Model.of("Is Administrator")) {
@Override
- public void populateItem(Item<ICellPopulator<Team>> cellItem, String componentId,
- IModel<Team> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getPrivilege().toString()));
+ public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,
+ IModel<Group> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().isAdministrator()));
}
});
- columns.add(new AbstractColumn<Team, Void>(Model.of("Members")) {
+ columns.add(new AbstractColumn<Group, Void>(Model.of("Can Create Projects")) {
@Override
- public void populateItem(Item<ICellPopulator<Team>> cellItem, String componentId,
- IModel<Team> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getMemberships().size()));
+ public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,
+ IModel<Group> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().isCanCreateProjects()));
}
});
- columns.add(new AbstractColumn<Team, Void>(Model.of("Actions")) {
+ columns.add(new AbstractColumn<Group, 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);
+ 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"));
- Team team = rowModel.getObject();
+ 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(TeamManager.class).delete(rowModel.getObject());
- setResponsePage(TeamListPage.class, TeamListPage.paramsOf(getProject()));
+ OneDev.getInstance(GroupManager.class).delete(rowModel.getObject());
+ setResponsePage(GroupListPage.class);
}
@Override
@@ -145,35 +157,35 @@ public class TeamListPage extends ProjectSettingPage {
setVisible(SecurityUtils.isAdministrator());
}
- }.add(new ConfirmOnClick("Do you really want to delete team '" + team.getName() + "'?")));
+ }.add(new ConfirmOnClick("Do you really want to delete group '" + group.getName() + "'?")));
cellItem.add(fragment);
}
});
- SortableDataProvider<Team, Void> dataProvider = new LoadableDetachableDataProvider<Team, Void>() {
+ SortableDataProvider<Group, Void> dataProvider = new SortableDataProvider<Group, Void>() {
@Override
- public Iterator<? extends Team> iterator(long first, long count) {
- EntityCriteria<Team> criteria = getCriteria();
+ public Iterator<? extends Group> iterator(long first, long count) {
+ EntityCriteria<Group> criteria = getCriteria();
criteria.addOrder(Order.asc("name"));
- return OneDev.getInstance(TeamManager.class).query(criteria, (int)first, (int)count).iterator();
+ return OneDev.getInstance(GroupManager.class).query(criteria, (int)first, (int)count).iterator();
}
@Override
- public long calcSize() {
- return OneDev.getInstance(TeamManager.class).count(getCriteria());
+ public long size() {
+ return OneDev.getInstance(GroupManager.class).count(getCriteria());
}
@Override
- public IModel<Team> model(Team object) {
+ public IModel<Group> model(Group object) {
Long id = object.getId();
- return new LoadableDetachableModel<Team>() {
+ return new LoadableDetachableModel<Group>() {
@Override
- protected Team load() {
- return OneDev.getInstance(TeamManager.class).load(id);
+ protected Group load() {
+ return OneDev.getInstance(GroupManager.class).load(id);
}
};
@@ -196,14 +208,19 @@ public class TeamListPage extends ProjectSettingPage {
};
- add(teamsTable = new HistoryAwareDataTable<>("teams", columns, dataProvider,
+ add(groupsTable = new HistoryAwareDataTable<>("groups", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.isAdministrator();
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new TeamCssResourceReference()));
+ response.render(CssHeaderItem.forReference(new GroupCssResourceReference()));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.html
new file mode 100644
index 0000000000..2e50193f50
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.html
@@ -0,0 +1,19 @@
+<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">
+ </div>
+ <div class="pull-left">
+ <input wicket:id="addNew" type="hidden" class="form-control">
+ </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="link"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a>
+ </wicket:fragment>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
new file mode 100644
index 0000000000..a1da5bd195
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
@@ -0,0 +1,279 @@
+package io.onedev.server.web.page.admin.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.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.MembershipManager;
+import io.onedev.server.manager.UserManager;
+import io.onedev.server.model.Membership;
+import io.onedev.server.model.User;
+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.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
+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.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;
+import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;
+import io.onedev.server.web.page.admin.user.UserProfilePage;
+import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.util.userident.UserIdent;
+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) {
+ User user = rowModel.getObject().getUser();
+ Fragment fragment = new Fragment(componentId, "nameFrag", GroupMembershipsPage.this);
+ Link<Void> link = new BookmarkablePageLink<Void>("link", UserProfilePage.class,
+ UserProfilePage.paramsOf(user));
+ link.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(user))));
+ link.add(new Label("name", user.getDisplayName()));
+ fragment.add(link);
+ 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).query(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/admin/group/GroupPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.html
new file mode 100644
index 0000000000..b8d098defd
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.html
@@ -0,0 +1,8 @@
+<wicket:extend>
+ <div id="group">
+ <div wicket:id="groupSidebar"></div>
+ <div class="content">
+ <wicket:child></wicket:child>
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java
new file mode 100644
index 0000000000..76704f29a6
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java
@@ -0,0 +1,85 @@
+package io.onedev.server.web.page.admin.group;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+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.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.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.admin.AdministrationPage;
+import io.onedev.server.web.util.model.EntityModel;
+
+@SuppressWarnings("serial")
+public abstract class GroupPage extends AdministrationPage {
+
+ private static final String PARAM_GROUP = "group";
+
+ protected final IModel<Group> groupModel;
+
+ public GroupPage(PageParameters 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("groupSidebar", null) {
+
+ @Override
+ protected Component newHead(String componentId) {
+ return new Label(componentId, getGroup().getName());
+ }
+
+ @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;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html
new file mode 100644
index 0000000000..6c5c209fea
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html
@@ -0,0 +1,24 @@
+<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">
+ <a wicket:id="delete" class="btn btn-danger pull-right">Delete</a>
+ </div>
+ </form>
+ </wicket:fragment>
+</wicket:extend>
\ No newline at end of file
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/admin/group/GroupProfilePage.java
similarity index 53%
rename from core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java
rename to core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
index aba90f889a..d574a9399e 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.page.admin.group;
import java.io.Serializable;
@@ -16,8 +16,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.UserManager;
-import io.onedev.server.model.User;
+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;
@@ -26,17 +26,17 @@ import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.util.ConfirmOnClick;
@SuppressWarnings("serial")
-public class UserProfilePage extends UserPage {
+public class GroupProfilePage extends GroupPage {
private BeanEditor editor;
- private String oldName;
-
private CheckBox administratorInput;
private CheckBox canCreateProjectsInput;
- public UserProfilePage(PageParameters params) {
+ private String oldName;
+
+ public GroupProfilePage(PageParameters params) {
super(params);
}
@@ -44,7 +44,7 @@ public class UserProfilePage extends UserPage {
protected void onInitialize() {
super.onInitialize();
- if (SecurityUtils.canAdministrate(getUser().getFacade())) {
+ if (SecurityUtils.isAdministrator()) {
Fragment fragment = new Fragment("content", "editFrag", this);
editor = BeanContext.editModel("editor", new IModel<Serializable>() {
@@ -54,61 +54,47 @@ public class UserProfilePage extends UserPage {
@Override
public Serializable getObject() {
- return getUser();
+ return getGroup();
}
@Override
public void setObject(Serializable object) {
- // check contract of UserManager.save on why we assign oldName here
- oldName = getUser().getName();
- editor.getBeanDescriptor().copyProperties(object, getUser());
+ // check contract of GroupManager.save on why we assign oldName here
+ oldName = getGroup().getName();
+ editor.getBeanDescriptor().copyProperties(object, getGroup());
}
- }, Sets.newHashSet("password", "administrator", "canCreateProjects"), true);
-
+ }, Sets.newHashSet("administrator", "canCreateProjects"), true);
+
Form<?> form = new Form<Void>("form") {
@Override
protected void onSubmit() {
super.onSubmit();
- User user = getUser();
- UserManager userManager = OneDev.getInstance(UserManager.class);
- User userWithSameName = userManager.findByName(user.getName());
- if (userWithSameName != null && !userWithSameName.equals(user)) {
+ 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 user.");
- }
- User userWithSameEmail = userManager.findByEmail(user.getEmail());
- if (userWithSameEmail != null && !userWithSameEmail.equals(user)) {
- editor.getErrorContext(new PathSegment.Property("email"))
- .addError("This email has already been used by another user.");
+ .addError("This name has already been used by another group.");
}
if (!editor.hasErrors(true)) {
- if (SecurityUtils.isAdministrator()) {
- user.setAdministrator(administratorInput.getModelObject());
- user.setCanCreateProjects(canCreateProjectsInput.getModelObject());
- }
- userManager.save(user, oldName);
+ groupManager.save(group, oldName);
+ setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(group));
Session.get().success("Profile updated");
- setResponsePage(UserProfilePage.class, UserProfilePage.paramsOf(user));
}
}
};
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 = new CheckBox("administrator", Model.of(getGroup().isAdministrator()));
administratorInput.add(new OnChangeAjaxBehavior() {
@Override
@@ -121,14 +107,11 @@ public class UserProfilePage extends UserPage {
});
form.add(administratorInput);
- canCreateProjectsInput = new CheckBox("canCreateProjects", Model.of(getUser().isCanCreateProjects())) {
+ canCreateProjectsInput = new CheckBox("canCreateProjects", Model.of(getGroup().isCanCreateProjects())) {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.isAdministrator()
- && !getUser().isRoot()
- && !getUser().equals(getLoginUser()));
setEnabled(!administratorInput.getModelObject());
}
@@ -142,23 +125,23 @@ public class UserProfilePage extends UserPage {
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.isAdministrator() && !getUser().isRoot());
+ setVisible(SecurityUtils.isAdministrator());
}
@Override
public void onClick() {
- OneDev.getInstance(UserManager.class).delete(getUser());
- setResponsePage(UserListPage.class);
+ OneDev.getInstance(GroupManager.class).delete(getGroup());
+ setResponsePage(GroupListPage.class);
}
- }.add(new ConfirmOnClick("Do you really want to delete user '" + getUser().getDisplayName() + "'?")));
+ }.add(new ConfirmOnClick("Do you really want to delete group '" + getGroup().getName() + "'?")));
fragment.add(form);
add(fragment);
} else {
- User user = new User();
- new BeanDescriptor(User.class).copyProperties(getUser(), user);
- add(BeanContext.viewBean("content", user, Sets.newHashSet("password"), true));
+ 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/admin/group/GroupTab.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupTab.java
new file mode 100644
index 0000000000..ddfeae5d16
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupTab.java
@@ -0,0 +1,52 @@
+package io.onedev.server.web.page.admin.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/user/UserTabLink.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupTabLink.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/user/UserTabLink.html
rename to core/src/main/java/io/onedev/server/web/page/admin/group/GroupTabLink.html
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupTabLink.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupTabLink.java
new file mode 100644
index 0000000000..e37e83f946
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupTabLink.java
@@ -0,0 +1,34 @@
+package io.onedev.server.web.page.admin.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/admin/group/NewGroupPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.html
new file mode 100644
index 0000000000..7a9c13bf11
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.html
@@ -0,0 +1,22 @@
+<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 file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java
new file mode 100644
index 0000000000..ad3c15b5b2
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java
@@ -0,0 +1,100 @@
+package io.onedev.server.web.page.admin.group;
+
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.Form;
+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.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.PathSegment;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public class NewGroupPage extends AdministrationPage {
+
+ 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 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/admin/group/group.css b/core/src/main/java/io/onedev/server/web/page/admin/group/group.css
new file mode 100644
index 0000000000..d271321c8e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/group.css
@@ -0,0 +1,40 @@
+#group>.sidebar {
+ left: 240px;
+ background: white;
+ border-left: none;
+ /* make it absolute as we do not want to make it stay fixed to occupy screen space on mobile screen */
+ position: absolute;
+ z-index: 0;
+ /* use hacks below to make the sidebar extend to the screen bottom even if body does not reach to the bottom */
+ margin-bottom: -10000px;
+ padding-bottom: 10000px;
+}
+#group>.sidebar>.head {
+ border-bottom: 2px solid #E0E0E0;
+ font-size: 16px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ height: 40px;
+ padding: 8px 14px;
+}
+
+#group>.sidebar>.tabs {
+ top: 40px;
+}
+#group>.sidebar>.tabs>li>a {
+ border-left: none;
+ padding: 12px 14px;
+}
+#administration>.minimized.sidebar+.content>#group>.sidebar {
+ left: 44px;
+}
+
+#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/admin/user/NewUserPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.html
new file mode 100644
index 0000000000..48821d1228
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.html
@@ -0,0 +1,13 @@
+<wicket:extend>
+ <div class="new-user">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor"></div>
+ <div class="actions clearfix">
+ <input class="btn btn-primary dirty-aware pull-left" value="Create" type="submit">
+ <div class="checkbox pull-left">
+ <label> <input wicket:id="continueToAdd" type="checkbox"> Continue to add other user after create</label>
+ </div>
+ </div>
+ </form>
+ </div>
+</wicket:extend>
\ No newline at end of file
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/admin/user/NewUserPage.java
similarity index 58%
rename from core/src/main/java/io/onedev/server/web/page/user/NewUserPage.java
rename to core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java
index a83aa904ba..f00812caa7 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java
@@ -1,47 +1,34 @@
-package io.onedev.server.web.page.user;
-
-import java.util.Set;
+package io.onedev.server.web.page.admin.user;
import org.apache.shiro.authc.credential.PasswordService;
import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
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.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
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;
+import io.onedev.server.web.page.admin.AdministrationPage;
@SuppressWarnings("serial")
-public class NewUserPage extends LayoutPage {
+public class NewUserPage extends AdministrationPage {
private User user = new User();
- private CheckBox administratorInput;
-
- private CheckBox canCreateProjectsInput;
-
private boolean continueToAdd;
@Override
protected void onInitialize() {
super.onInitialize();
- Set<String> excludedProperties = Sets.newHashSet("administrator", "canCreateProjects");
- BeanEditor editor = BeanContext.editBean("editor", user, excludedProperties, true);
+ BeanEditor editor = BeanContext.editBean("editor", user);
Form<?> form = new Form<Void>("form") {
@@ -61,8 +48,6 @@ 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");
@@ -70,38 +55,13 @@ public class NewUserPage extends LayoutPage {
user = new User();
replace(BeanContext.editBean("editor", user));
} else {
- setResponsePage(UserListPage.class);
+ setResponsePage(UserMembershipsPage.class, UserMembershipsPage.paramsOf(user));
}
}
}
};
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>() {
@Override
@@ -122,11 +82,6 @@ public class NewUserPage extends LayoutPage {
add(form);
}
- @Override
- protected boolean isPermitted() {
- return SecurityUtils.isAdministrator();
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.html
new file mode 100644
index 0000000000..1d4864de78
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.html
@@ -0,0 +1,23 @@
+<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 file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java
new file mode 100644
index 0000000000..49035be63d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java
@@ -0,0 +1,490 @@
+package io.onedev.server.web.page.admin.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.permission.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.project.choice.AbstractProjectChoiceProvider;
+import io.onedev.server.web.component.project.choice.ProjectChoiceResourceReference;
+import io.onedev.server.web.component.project.privilege.selection.PrivilegeSelectionPanel;
+import io.onedev.server.web.component.project.privilege.source.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.WordUtils;
+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.ADMINISTRATION);
+ 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()) {
+ ProjectPrivilege privilege = projectAuthorizations.get(project.getId());
+ if (project.getDefaultPrivilege() != null) {
+ if (privilege == null || project.getDefaultPrivilege().getProjectPrivilege().implies(privilege))
+ projectAuthorizations.put(project.getId(), project.getDefaultPrivilege().getProjectPrivilege());
+ 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 WordUtils.toWords(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/admin/user/UserAvatarPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAvatarPage.html
new file mode 100644
index 0000000000..d93f935cce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAvatarPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAvatarPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAvatarPage.java
new file mode 100644
index 0000000000..bb61508634
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAvatarPage.java
@@ -0,0 +1,20 @@
+package io.onedev.server.web.page.admin.user;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.web.component.user.avataredit.AvatarEditPanel;
+
+@SuppressWarnings("serial")
+public class UserAvatarPage extends UserPage {
+
+ public UserAvatarPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new AvatarEditPanel("content", userModel));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserCssResourceReference.java
similarity index 86%
rename from core/src/main/java/io/onedev/server/web/page/user/UserCssResourceReference.java
rename to core/src/main/java/io/onedev/server/web/page/admin/user/UserCssResourceReference.java
index 80e6ee0374..429011061e 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/UserCssResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserCssResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.page.admin.user;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
similarity index 85%
rename from core/src/main/java/io/onedev/server/web/page/user/UserListPage.html
rename to core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
index f7e56c9dcf..b969f3a480 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
@@ -2,7 +2,7 @@
<div class="user list">
<div class="head clearfix">
<div class="pull-left clearable-wrapper">
- <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by name"></input>
+ <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by name">
</div>
<div class="pull-left">
<a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New User</a>
@@ -13,8 +13,7 @@
</div>
</div>
<wicket:fragment wicket:id="nameFrag">
- <a wicket:id="avatarLink" class="avatar"></a>
- <a wicket:id="nameLink" class="name"></a>
+ <a wicket:id="link"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a>
</wicket:fragment>
<wicket:fragment wicket:id="actionFrag">
<a wicket:id="profile" title="Profile of this user"><i class="fa fa-cog"></i></a>
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/admin/user/UserListPage.java
similarity index 84%
rename from core/src/main/java/io/onedev/server/web/page/user/UserListPage.java
rename to core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
index 383b491b73..ad41c7f144 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.page.admin.user;
import java.util.ArrayList;
import java.util.Iterator;
@@ -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;
@@ -31,19 +32,19 @@ import io.onedev.server.manager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.SecurityUtils;
+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.datatable.HistoryAwareDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
-import io.onedev.server.web.component.link.UserLink;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
-import io.onedev.server.web.page.layout.LayoutPage;
+import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.PagingHistorySupport;
-import io.onedev.utils.StringUtils;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
-public class UserListPage extends LayoutPage {
+public class UserListPage extends AdministrationPage {
private static final String PARAM_CURRENT_PAGE = "currentPage";
@@ -61,11 +62,6 @@ public class UserListPage extends LayoutPage {
return criteria;
}
- @Override
- protected boolean isPermitted() {
- return SecurityUtils.isAdministrator();
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
@@ -99,46 +95,36 @@ public class UserListPage extends LayoutPage {
List<IColumn<User, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<User, Void>(Model.of("Name")) {
+ columns.add(new AbstractColumn<User, Void>(Model.of("Login Name")) {
@Override
public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId,
IModel<User> rowModel) {
User user = rowModel.getObject();
Fragment fragment = new Fragment(componentId, "nameFrag", UserListPage.this);
- fragment.add(new UserAvatarLink("avatarLink", user));
- fragment.add(new UserLink("nameLink", user));
+ Link<Void> link = new BookmarkablePageLink<Void>("link", UserProfilePage.class, UserProfilePage.paramsOf(user));
+ link.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(user))));
+ link.add(new Label("name", user.getName()));
+ fragment.add(link);
cellItem.add(fragment);
}
});
- columns.add(new AbstractColumn<User, Void>(Model.of("Email")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId,
- IModel<User> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getEmail()));
- }
- });
-
- columns.add(new AbstractColumn<User, Void>(Model.of("Administrator")) {
+ columns.add(new AbstractColumn<User, Void>(Model.of("Full Name")) {
@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())));
+ cellItem.add(new Label(componentId, rowModel.getObject().getFullName()));
}
});
- columns.add(new AbstractColumn<User, Void>(Model.of("Can Create Projects")) {
+ columns.add(new AbstractColumn<User, Void>(Model.of("Email")) {
@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())));
+ cellItem.add(new Label(componentId, rowModel.getObject().getEmail()));
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.html
rename to core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.html
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java
new file mode 100644
index 0000000000..2f9c8c91af
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java
@@ -0,0 +1,272 @@
+package io.onedev.server.web.page.admin.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.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.admin.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
+ 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);
+ }
+
+ };
+ 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).query(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.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.html
similarity index 71%
rename from core/src/main/java/io/onedev/server/web/page/user/UserPage.html
rename to core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.html
index 3227535119..3bb3a75b12 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/UserPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.html
@@ -1,12 +1,12 @@
<wicket:extend>
<div id="user">
- <div wicket:id="sidebar"></div>
+ <div wicket:id="userSidebar"></div>
<div class="content">
<wicket:child></wicket:child>
</div>
</div>
<wicket:fragment wicket:id="sidebarHeadFrag">
- <img wicket:id="avatar"></img>
+ <img wicket:id="avatar">
<span wicket:id="name"></span>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
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/admin/user/UserPage.java
similarity index 70%
rename from core/src/main/java/io/onedev/server/web/page/user/UserPage.java
rename to core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
index 7126d9858a..3933796964 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/UserPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.page.admin.user;
import java.util.ArrayList;
import java.util.List;
@@ -15,25 +15,23 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.UserFacade;
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.component.user.avatar.UserAvatar;
-import io.onedev.server.web.page.layout.LayoutPage;
+import io.onedev.server.web.page.admin.AdministrationPage;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.model.EntityModel;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
-public abstract class UserPage extends LayoutPage {
+public abstract class UserPage extends AdministrationPage {
private static final String PARAM_USER = "user";
protected final IModel<User> userModel;
public UserPage(PageParameters params) {
- super(params);
-
User user = OneDev.getInstance(UserManager.class).load(params.get(PARAM_USER).toLong());
userModel = new EntityModel<User>(user);
}
@@ -42,30 +40,28 @@ public abstract class UserPage extends LayoutPage {
protected void onInitialize() {
super.onInitialize();
- add(new SideBar("sidebar", "user.miniSidebar") {
+ add(new SideBar("userSidebar", "user.miniSidebar") {
@Override
protected Component newHead(String componentId) {
Fragment fragment = new Fragment(componentId, "sidebarHeadFrag", UserPage.this);
User user = userModel.getObject();
- fragment.add(new UserAvatar("avatar", user).add(AttributeAppender.append("title", user.getDisplayName())));
+ fragment.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(user))).add(AttributeAppender.append("title", user.getDisplayName())));
fragment.add(new Label("name", user.getDisplayName()));
return fragment;
}
-
+
@Override
protected List<? extends Tab> newTabs() {
List<PageTab> tabs = new ArrayList<>();
tabs.add(new UserTab("Profile", "fa fa-fw fa-list-alt", UserProfilePage.class));
- if (SecurityUtils.canAdministrate(getUser().getFacade())) {
- tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));
+ tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", UserAvatarPage.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("Participated Projects", "fa fa-ext fa-fw fa-repo", ParticipatedProjectsPage.class));
+ tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));
+ tabs.add(new UserTab("Access Token", "fa fa-fw fa-ticket", UserTokenPage.class));
+ tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));
+ tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));
return tabs;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.html
new file mode 100644
index 0000000000..d93f935cce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.java
new file mode 100644
index 0000000000..afc5056904
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.java
@@ -0,0 +1,21 @@
+package io.onedev.server.web.page.admin.user;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.web.component.user.passwordedit.PasswordEditPanel;
+
+@SuppressWarnings("serial")
+public class UserPasswordPage extends UserPage {
+
+ public UserPasswordPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new PasswordEditPanel("content", userModel));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.html
new file mode 100644
index 0000000000..d93f935cce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.java
new file mode 100644
index 0000000000..3755076b8e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.java
@@ -0,0 +1,21 @@
+package io.onedev.server.web.page.admin.user;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;
+
+@SuppressWarnings("serial")
+public class UserProfilePage extends UserPage {
+
+ public UserProfilePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new ProfileEditPanel("content", userModel));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserTab.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTab.java
similarity index 97%
rename from core/src/main/java/io/onedev/server/web/page/user/UserTab.java
rename to core/src/main/java/io/onedev/server/web/page/admin/user/UserTab.java
index b5a5b4cd25..3bfd2d654f 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/UserTab.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTab.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.page.admin.user;
import org.apache.wicket.Component;
import org.apache.wicket.model.Model;
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserTabLink.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTabLink.html
new file mode 100644
index 0000000000..f9086e7c60
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTabLink.html
@@ -0,0 +1,3 @@
+<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 file
diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserTabLink.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTabLink.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/web/page/user/UserTabLink.java
rename to core/src/main/java/io/onedev/server/web/page/admin/user/UserTabLink.java
index 4819c9d7f1..7346bed326 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/UserTabLink.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTabLink.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.user;
+package io.onedev.server.web.page.admin.user;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.html
new file mode 100644
index 0000000000..d93f935cce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.java
new file mode 100644
index 0000000000..54b62a6778
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.java
@@ -0,0 +1,21 @@
+package io.onedev.server.web.page.admin.user;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.web.component.user.tokengenerate.TokenGeneratePanel;
+
+@SuppressWarnings("serial")
+public class UserTokenPage extends UserPage {
+
+ public UserTokenPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new TokenGeneratePanel("content", userModel));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/user.css b/core/src/main/java/io/onedev/server/web/page/admin/user/user.css
new file mode 100644
index 0000000000..f06cbb6455
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/user.css
@@ -0,0 +1,53 @@
+#user>.sidebar {
+ left: 240px;
+ background: white;
+ border-left: none;
+ /* make it absolute as we do not want to make it stay fixed to occupy screen space on mobile screen */
+ position: absolute;
+ z-index: 0;
+ /* use hacks below to make the sidebar extend to the screen bottom even if body does not reach to the bottom */
+ margin-bottom: -10000px;
+ padding-bottom: 10000px;
+}
+#user>.sidebar>.head {
+ border-bottom: 2px solid #E0E0E0;
+ padding: 10px;
+ font-size: 16px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ height: 54px;
+}
+#user>.sidebar>.head img {
+ width: 32px;
+ height: 32px;
+}
+#user>.sidebar>.tabs {
+ top: 54px;
+}
+#user>.sidebar>.tabs>li>a {
+ padding: 12px 14px;
+ border-left: none;
+}
+#administration>.minimized.sidebar+.content>#user>.sidebar {
+ left: 44px;
+}
+
+#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 {
+ width: 240px;
+}
+
+.user.list .actions a {
+ color: #666;
+}
+.new-user .actions .btn {
+ margin-right: 20px;
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/base/BasePage.html b/core/src/main/java/io/onedev/server/web/page/base/BasePage.html
index 4119d2f0e3..d38a6d1909 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/BasePage.html
+++ b/core/src/main/java/io/onedev/server/web/page/base/BasePage.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title wicket:id="pageTitle"></title>
+ <title wicket:id="pageTitle">OneDev</title>
<meta wicket:id="pageRefresh" http-equiv="refresh"/>
<meta name="Author" content="OneDev Pty." />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.css
index ed43693553..9684ec3c3b 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -610,3 +610,18 @@ a.input-clear.input-group-clear {
a.disabled, a[disabled="disabled"] {
cursor: default;
}
+
+.floating {
+ background-clip: padding-box;
+ background-color: #FFF;
+ border: 1px solid rgba(0, 0, 0, 0.2);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+ position: absolute;
+ border-radius: 3px;
+ z-index: 2000;
+}
+
+/* wicket default ajax lazyload style */
+.floating>.content>div>img[alt="Loading..."] {
+ margin: 8px;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.html b/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.html
index f641eb84e2..08bbef6e1b 100644
--- a/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.html
@@ -2,7 +2,7 @@
<wicket:extend>
<div id="server-init" class="center-box">
<div class="title">
- <i class="fa fa-ext fa-onedev-logo"></i>
+ <img src="/img/logo.png" class="logo">
<span wicket:id="title"></span>
</div>
<div wicket:id="wizard"></div>
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.html
index 39fb913150..7089b263c7 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
@@ -17,8 +17,8 @@
<ul class="nav navbar-nav tabs">
<li wicket:id="navProjects"><a wicket:id="link">Projects</a></li>
<li wicket:id="navContributions"><a wicket:id="link"><span wicket:id="label"></span></a></li>
- <li wicket:id="navUsers"><a wicket:id="link">Users</a></li>
<li wicket:id="navAdministration"><a wicket:id="link">Administration</a></li>
+ <li wicket:id="navMy"><a wicket:id="link">My</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
@@ -44,7 +44,6 @@
<ul class="dropdown-menu">
<li wicket:id="userNameExpanded" class="dropdown-header expanded"></li>
<li role="separator" class="divider expanded"></li>
- <li><a wicket:id="profile">My Setting</a></li>
<li><a wicket:id="signOut">Sign Out</a></li>
</ul>
</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.java
index d617e5ebd3..fd712a66d0 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
@@ -22,19 +22,20 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.user.avatar.UserAvatar;
import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
+import io.onedev.server.web.page.admin.user.UserListPage;
import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.page.my.MyPage;
+import io.onedev.server.web.page.my.MyProfilePage;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.security.LoginPage;
import io.onedev.server.web.page.security.LogoutPage;
import io.onedev.server.web.page.security.RegisterPage;
-import io.onedev.server.web.page.user.UserListPage;
-import io.onedev.server.web.page.user.UserPage;
-import io.onedev.server.web.page.user.UserProfilePage;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public abstract class LayoutPage extends BasePage {
@@ -50,6 +51,8 @@ public abstract class LayoutPage extends BasePage {
protected void onInitialize() {
super.onInitialize();
+ User loginUser = getLoginUser();
+
WebMarkupContainer projectsContainer = new WebMarkupContainer("navProjects");
projectsContainer.add(new ViewStateAwarePageLink<Void>("link", ProjectListPage.class));
if (getPage() instanceof ProjectListPage || getPage() instanceof ProjectPage)
@@ -78,15 +81,15 @@ public abstract class LayoutPage extends BasePage {
}
add(contributionsView);
- WebMarkupContainer usersContainer = new WebMarkupContainer("navUsers");
- usersContainer.add(new ViewStateAwarePageLink<Void>("link", UserListPage.class));
- if (getPage() instanceof UserListPage || getPage() instanceof UserPage)
- usersContainer.add(AttributeAppender.append("class", "active"));
- usersContainer.setVisible(SecurityUtils.isAdministrator());
- add(usersContainer);
+ WebMarkupContainer myContainer = new WebMarkupContainer("navMy");
+ myContainer.add(new ViewStateAwarePageLink<Void>("link", MyProfilePage.class));
+ if (getPage() instanceof MyPage)
+ myContainer.add(AttributeAppender.append("class", "active"));
+ myContainer.setVisible(loginUser != null);
+ add(myContainer);
WebMarkupContainer administrationContainer = new WebMarkupContainer("navAdministration");
- administrationContainer.add(new ViewStateAwarePageLink<Void>("link", SystemSettingPage.class));
+ administrationContainer.add(new ViewStateAwarePageLink<Void>("link", UserListPage.class));
if (getPage() instanceof AdministrationPage)
administrationContainer.add(AttributeAppender.append("class", "active"));
administrationContainer.setVisible(SecurityUtils.isAdministrator());
@@ -106,18 +109,15 @@ public abstract class LayoutPage extends BasePage {
});
- User loginUser = getLoginUser();
boolean enableSelfRegister = OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfRegister();
notSignedInContainer.add(new ViewStateAwarePageLink<Void>("signUp", RegisterPage.class).setVisible(enableSelfRegister));
notSignedInContainer.setVisible(loginUser == null);
add(notSignedInContainer);
WebMarkupContainer signedInContainer = new WebMarkupContainer("signedIn");
- signedInContainer.add(new UserAvatar("avatar", loginUser));
+ signedInContainer.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(loginUser))));
signedInContainer.add(new Label("userNameExpanded", loginUser!=null?loginUser.getDisplayName():""));
signedInContainer.add(new Label("userNameCollapsed", loginUser!=null?loginUser.getDisplayName():""));
- signedInContainer.add(new ViewStateAwarePageLink<Void>("profile", UserProfilePage.class,
- loginUser!=null?UserProfilePage.paramsOf(loginUser):new PageParameters()));
signedInContainer.add(new ViewStateAwarePageLink<Void>("signOut", LogoutPage.class));
signedInContainer.setVisible(loginUser != null);
add(signedInContainer);
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.html b/core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.html
new file mode 100644
index 0000000000..d93f935cce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.java b/core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.java
new file mode 100644
index 0000000000..b72e3e9bd5
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.java
@@ -0,0 +1,24 @@
+package io.onedev.server.web.page.my;
+
+import org.apache.wicket.model.AbstractReadOnlyModel;
+
+import io.onedev.server.model.User;
+import io.onedev.server.web.component.user.avataredit.AvatarEditPanel;
+
+@SuppressWarnings("serial")
+public class MyAvatarPage extends MyPage {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new AvatarEditPanel("content", new AbstractReadOnlyModel<User>() {
+
+ @Override
+ public User getObject() {
+ return getLoginUser();
+ }
+
+ }));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/my/MyCssResourceReference.java
new file mode 100644
index 0000000000..181da19417
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.my;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class MyCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public MyCssResourceReference() {
+ super(MyCssResourceReference.class, "my.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyPage.html b/core/src/main/java/io/onedev/server/web/page/my/MyPage.html
new file mode 100644
index 0000000000..d54bdbd06b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyPage.html
@@ -0,0 +1,8 @@
+<wicket:extend>
+ <div id="my">
+ <div wicket:id="mySidebar"></div>
+ <div class="content">
+ <wicket:child></wicket:child>
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyPage.java b/core/src/main/java/io/onedev/server/web/page/my/MyPage.java
new file mode 100644
index 0000000000..f4d777d6df
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyPage.java
@@ -0,0 +1,49 @@
+package io.onedev.server.web.page.my;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+
+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.page.security.LoginPage;
+
+@SuppressWarnings("serial")
+public abstract class MyPage extends LayoutPage {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ if (getLoginUser() == null)
+ throw new RestartResponseAtInterceptPageException(LoginPage.class);
+
+ add(new SideBar("mySidebar", "my.miniSidebar") {
+
+ @Override
+ protected List<? extends Tab> newTabs() {
+ List<PageTab> tabs = new ArrayList<>();
+
+ tabs.add(new MyTab("Profile", "fa fa-fw fa-list-alt", MyProfilePage.class));
+ tabs.add(new MyTab("Edit Avatar", "fa fa-fw fa-picture-o", MyAvatarPage.class));
+ tabs.add(new MyTab("Change Password", "fa fa-fw fa-key", MyPasswordPage.class));
+ tabs.add(new MyTab("Access Token", "fa fa-fw fa-ticket", MyTokenPage.class));
+
+ return tabs;
+ }
+
+ });
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new MyCssResourceReference()));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.html b/core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.html
new file mode 100644
index 0000000000..d93f935cce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.java b/core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.java
new file mode 100644
index 0000000000..819bff5295
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.java
@@ -0,0 +1,25 @@
+package io.onedev.server.web.page.my;
+
+import org.apache.wicket.model.AbstractReadOnlyModel;
+
+import io.onedev.server.model.User;
+import io.onedev.server.web.component.user.passwordedit.PasswordEditPanel;
+
+@SuppressWarnings("serial")
+public class MyPasswordPage extends MyPage {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new PasswordEditPanel("content", new AbstractReadOnlyModel<User>() {
+
+ @Override
+ public User getObject() {
+ return getLoginUser();
+ }
+
+ }));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.html b/core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.html
new file mode 100644
index 0000000000..d93f935cce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.java b/core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.java
new file mode 100644
index 0000000000..e44f092eab
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.java
@@ -0,0 +1,25 @@
+package io.onedev.server.web.page.my;
+
+import org.apache.wicket.model.AbstractReadOnlyModel;
+
+import io.onedev.server.model.User;
+import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;
+
+@SuppressWarnings("serial")
+public class MyProfilePage extends MyPage {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new ProfileEditPanel("content", new AbstractReadOnlyModel<User>() {
+
+ @Override
+ public User getObject() {
+ return getLoginUser();
+ }
+
+ }));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyTab.java b/core/src/main/java/io/onedev/server/web/page/my/MyTab.java
new file mode 100644
index 0000000000..a132ac1002
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyTab.java
@@ -0,0 +1,52 @@
+package io.onedev.server.web.page.my;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.web.component.tabbable.PageTab;
+
+@SuppressWarnings("serial")
+public class MyTab extends PageTab {
+
+ private final String iconClass;
+
+ public MyTab(String title, String iconClass, Class<? extends MyPage> mainPageClass) {
+ super(Model.of(title), mainPageClass);
+
+ this.iconClass = iconClass;
+ }
+
+ public MyTab(String title, String iconClass, Class<? extends MyPage> mainPageClass,
+ Class<? extends MyPage> additionalPageClass1) {
+ super(Model.of(title), mainPageClass, additionalPageClass1);
+
+ this.iconClass = iconClass;
+ }
+
+ public MyTab(String title, String iconClass, Class<? extends MyPage> mainPageClass,
+ Class<? extends MyPage> additionalPageClass1,
+ Class<? extends MyPage> additionalPageClass2) {
+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);
+
+ this.iconClass = iconClass;
+ }
+
+ public MyTab(String title, String iconClass, Class<? extends MyPage> mainPageClass,
+ Class<? extends MyPage> additionalPageClass1,
+ Class<? extends MyPage> additionalPageClass2,
+ Class<? extends MyPage> 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 MyTabLink(componentId, this);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyTabLink.html b/core/src/main/java/io/onedev/server/web/page/my/MyTabLink.html
new file mode 100644
index 0000000000..f9086e7c60
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyTabLink.html
@@ -0,0 +1,3 @@
+<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 file
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyTabLink.java b/core/src/main/java/io/onedev/server/web/page/my/MyTabLink.java
new file mode 100644
index 0000000000..934194509b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyTabLink.java
@@ -0,0 +1,32 @@
+package io.onedev.server.web.page.my;
+
+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 MyTabLink extends Panel {
+
+ private final MyTab tab;
+
+ public MyTabLink(String id, MyTab tab) {
+ super(id);
+
+ this.tab = tab;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", tab.getMainPageClass());
+ 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/my/MyTokenPage.html b/core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.html
new file mode 100644
index 0000000000..d93f935cce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.java b/core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.java
new file mode 100644
index 0000000000..03c6fbe46f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.java
@@ -0,0 +1,25 @@
+package io.onedev.server.web.page.my;
+
+import org.apache.wicket.model.AbstractReadOnlyModel;
+
+import io.onedev.server.model.User;
+import io.onedev.server.web.component.user.tokengenerate.TokenGeneratePanel;
+
+@SuppressWarnings("serial")
+public class MyTokenPage extends MyPage {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new TokenGeneratePanel("content", new AbstractReadOnlyModel<User>() {
+
+ @Override
+ public User getObject() {
+ return getLoginUser();
+ }
+
+ }));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/my/my.css b/core/src/main/java/io/onedev/server/web/page/my/my.css
new file mode 100644
index 0000000000..e69de29bb2
diff --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.html
index 4fe394f507..afec0d79dd 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
@@ -2,7 +2,7 @@
<div class="project list">
<div class="head clearfix">
<div class="pull-left clearable-wrapper">
- <input wicket:id="filterProjects" class="form-control search" placeholder="Filter projects"></input>
+ <input wicket:id="filterProjects" class="form-control search" placeholder="Filter projects">
</div>
<div class="pull-left">
<a wicket:id="createProject" class="btn btn-default"><i class="fa fa-plus"></i> Create Project</a>
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.java
index f577e41de8..57fc19c029 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
@@ -25,9 +25,9 @@ import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
-import io.onedev.server.util.facade.MembershipFacade;
+import io.onedev.server.util.facade.GroupAuthorizationFacade;
import io.onedev.server.util.facade.ProjectFacade;
-import io.onedev.server.util.facade.TeamFacade;
+import io.onedev.server.util.facade.UserAuthorizationFacade;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.project.list.ProjectListPanel;
import io.onedev.server.web.page.layout.LayoutPage;
@@ -51,19 +51,20 @@ 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 (TeamFacade team: cacheManager.getTeams().values()) {
- if (team.getPrivilege() == ProjectPrivilege.PROJECT_ADMINISTRATION && teamIdsWithMembers.contains(team.getId()))
- projectIdsWithExplicitAdministrators.add(team.getProjectId());
+ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {
+ if (authorization.getPrivilege() == ProjectPrivilege.ADMINISTRATION)
+ projectIdsWithExplicitAdministrators.add(authorization.getProjectId());
+ }
+ for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {
+ if (authorization.getPrivilege() == ProjectPrivilege.ADMINISTRATION)
+ projectIdsWithExplicitAdministrators.add(authorization.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/blob/render/renderers/folder/FolderViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
index bf481ade09..2541a4fdb6 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
@@ -23,4 +23,5 @@
<div wicket:id="body" class="body"></div>
</div>
</div>
+ <div wicket:id="userDetail" class="user-detail-content"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
index 9b5f0343d1..903687d3f6 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
@@ -7,7 +7,10 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.CallbackParameter;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -21,6 +24,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
@@ -29,18 +33,25 @@ import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
+import io.onedev.server.OneDev;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.component.markdown.MarkdownViewer;
+import io.onedev.server.web.component.user.detail.UserDetailPanel;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
@SuppressWarnings("serial")
public class FolderViewPanel extends Panel {
+ private static final String USER_DETAIL_ID = "userDetail";
+
private final BlobRenderContext context;
private final IModel<List<BlobIdent>> childrenModel = new LoadableDetachableModel<List<BlobIdent>>() {
@@ -105,6 +116,8 @@ public class FolderViewPanel extends Panel {
};
+ private AbstractDefaultAjaxBehavior userDetailBehavior;
+
public FolderViewPanel(String id, BlobRenderContext context) {
super(id);
@@ -249,6 +262,26 @@ public class FolderViewPanel extends Panel {
add(readmeContainer);
+ add(new WebMarkupContainer(USER_DETAIL_ID).setOutputMarkupId(true));
+ add(userDetailBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ String jsonOfUserIdent = RequestCycle.get().getRequest().getPostParameters().getParameterValue("userIdent").toString();
+ try {
+ UserIdent userIdent = OneDev.getInstance(ObjectMapper.class).readValue(jsonOfUserIdent, UserIdent.class);
+ Component userDetail = new UserDetailPanel(USER_DETAIL_ID, userIdent);
+ userDetail.setOutputMarkupId(true);
+ replace(userDetail);
+ target.add(userDetail);
+ target.appendJavaScript("onedev.server.folderView.onUserDetailAvailable();");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ });
+
setOutputMarkupId(true);
}
@@ -261,8 +294,9 @@ public class FolderViewPanel extends Panel {
PageParameters params = LastCommitsResource.paramsOf(context.getProject(),
context.getBlobIdent().revision, context.getBlobIdent().path);
String lastCommitsUrl = urlFor(new LastCommitsResourceReference(), params).toString();
- response.render(OnDomReadyHeaderItem.forScript(
- String.format("onedev.server.folderView('%s', '%s')", getMarkupId(), lastCommitsUrl)));
+ CharSequence callback = userDetailBehavior.getCallbackFunction(CallbackParameter.explicit("userIdent"));
+ String script = String.format("onedev.server.folderView.onDomReady('%s', '%s', %s)", getMarkupId(), lastCommitsUrl, callback);
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
private ObjectId getCommitId() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java
index d395b1be0d..cc36d1e294 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java
@@ -4,8 +4,10 @@ import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
+import io.onedev.server.web.asset.hover.HoverResourceReference;
import io.onedev.server.web.component.user.avatar.UserAvatarResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -25,6 +27,7 @@ public class FolderViewResourceReference extends BaseDependentResourceReference
// add this dependency as the lazy loaded last commits information includes avatar displaying
dependencies.add(CssHeaderItem.forReference(new UserAvatarResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
return dependencies;
}
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.java
index bd8cb7b107..d4b2a700d1 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
@@ -6,27 +6,23 @@ import java.util.Map;
import javax.annotation.Nullable;
-import org.apache.commons.text.StringEscapeUtils;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.LastCommitsOfChildren;
-import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.page.user.UserProfilePage;
import io.onedev.server.web.util.avatar.AvatarManager;
/**
@@ -66,7 +62,6 @@ class LastCommitsResource extends AbstractResource {
LastCommitsOfChildren lastCommits = project.getLastCommitsOfChildren(revision, path);
- UserManager userManager = OneDev.getInstance(UserManager.class);
AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);
Map<String, LastCommitInfo> map = new HashMap<>();
@@ -76,21 +71,13 @@ class LastCommitsResource extends AbstractResource {
LastCommitsOfChildren.Value value = entry.getValue();
PageParameters params = CommitDetailPage.paramsOf(project, value.getId().name());
info.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
- info.summary = StringEscapeUtils.escapeHtml4(value.getSummary());
+ info.summary = value.getSummary();
info.when = DateUtils.formatAge(value.getCommitDate());
PersonIdent author = value.getAuthor();
- User user = userManager.find(author);
- if (user != null) {
- info.authorName = HtmlEscape.escapeHtml5(user.getDisplayName());
- info.authorAvatarUrl = avatarManager.getAvatarUrl(user.getFacade());
- params = UserProfilePage.paramsOf(user);
- info.authorUrl = RequestCycle.get().urlFor(UserProfilePage.class, params).toString();
- } else {
- info.authorName = HtmlEscape.escapeHtml5(author.getName());
- info.authorAvatarUrl = avatarManager.getAvatarUrl(author);
- }
-
+ UserIdent userIdent = UserIdent.of(author);
+ info.author = userIdent;
+ info.authorAvatarUrl = avatarManager.getAvatarUrl(userIdent);
map.put(entry.getKey(), info);
}
String json;
@@ -127,10 +114,8 @@ class LastCommitsResource extends AbstractResource {
String authorAvatarUrl;
- String authorName;
+ UserIdent author;
- @Nullable
- String authorUrl;
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css
index db55ff7ef9..0e587a04c7 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css
@@ -15,10 +15,9 @@
height: 20px;
}
.folder-view>table>tbody>tr>td.last-commit, .folder-view>table>tbody>tr>td.last-commit a {
- color: #444;
font-size: 13px;
}
-.folder-view>table>tbody>tr>td.last-commit.author span, .folder-view>table>tbody>tr>td.last-commit.when {
+.folder-view>table>tbody>tr>td.last-commit.when {
color: #888;
}
.folder-view>table>tbody>tr:first-child>td {
@@ -47,4 +46,7 @@
max-width: 900px;
margin-left: auto;
margin-right: auto;
-}
\ No newline at end of file
+}
+.folder-view a.user {
+ text-decoration: none;
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
index b61c8c58db..03e72044bb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
@@ -1,57 +1,78 @@
-onedev.server.folderView = function(containerId, lastCommitsUrl) {
- var $container = $("#" + containerId);
- var $folderView = $container.find(">.folder-view");
-
- $.ajax({
- url: lastCommitsUrl,
- cache: false,
- beforeSend: function(xhr) {
- xhr.setRequestHeader('Wicket-Ajax', 'true');
- xhr.setRequestHeader('Wicket-Ajax-BaseURL', Wicket.Ajax.baseUrl || '.');
- },
- success: function(lastCommits) {
- if (jQuery.contains(document, $container[0])) { // add this check to avoid rendering last commits if directory is changed
- var $table = $container.find(".folder-view>table");
- $table.find("tr.child").each(function() {
- var $row = $(this);
- var path = $row.find("td.path span").text();
- var index = path.indexOf('/');
- if (index != -1)
- path = path.substring(0, index);
- var lastCommit = lastCommits[path];
+onedev.server.folderView = {
+ onDomReady: function(containerId, lastCommitsUrl, userDetailCallback) {
+ var $container = $("#" + containerId);
+ var $folderView = $container.find(">.folder-view");
+
+ $.ajax({
+ url: lastCommitsUrl,
+ cache: false,
+ beforeSend: function(xhr) {
+ xhr.setRequestHeader('Wicket-Ajax', 'true');
+ xhr.setRequestHeader('Wicket-Ajax-BaseURL', Wicket.Ajax.baseUrl || '.');
+ },
+ success: function(lastCommits) {
+ if (jQuery.contains(document, $container[0])) { // add this check to avoid rendering last commits if directory is changed
+ var $table = $container.find(".folder-view>table");
+ $table.find("tr.child").each(function() {
+ var $row = $(this);
+ var path = $row.find("td.path span").text();
+ var index = path.indexOf('/');
+ if (index != -1)
+ path = path.substring(0, index);
+ var lastCommit = lastCommits[path];
- if (lastCommit) {
- var html;
- if (lastCommit.authorUrl) {
- html = "<a href='" + lastCommit.authorUrl + "' class='avatar'><img src='" + lastCommit.authorAvatarUrl + "' class='avatar'/></a>";
- html += "<a href='" + lastCommit.authorUrl + "' class='name'>" + lastCommit.authorName + "</a>";
- } else {
- html = "<img src='" + lastCommit.authorAvatarUrl + "' class='avatar'/> ";
- html += "<span class='name'>" + lastCommit.authorName + "</span>";
+ if (lastCommit) {
+ if (lastCommit.author["@class"].indexOf("SystemUserIdent") != -1) {
+ var html = "<span class='user'><img src='" + lastCommit.authorAvatarUrl + "' class='avatar'/> <span class='name'>OneDev</span></span>";
+ $row.children(".last-commit.author").empty().append(html);
+ } else {
+ var html = "<a class='user'><img src='" + lastCommit.authorAvatarUrl + "' class='avatar'/> <span class='name'></span></a>";
+ var $author = $row.children(".last-commit.author");
+ $author.empty().append(html);
+ $author.find(".name").text(lastCommit.author.name);
+ }
+
+ $row.children(".last-commit.when").append("<span>" + lastCommit.when + "</span>");
+ var $message = $row.children(".last-commit.message");
+ $message.append("<a href='" + lastCommit.url + "'></a>");
+ $message.find("a").text(lastCommit.summary);
+
+ var alignment = {targetX: 0, targetY: 0, x: 0, y: 100, offset: 8};
+ $row.find("a.user").hover(function() {
+ var $detail = $("<div id='user-detail' class='floating'></div>");
+ $detail.hide();
+ $detail.data("trigger", this);
+ $detail.data("alignment", alignment);
+ $("body").append($detail);
+ userDetailCallback(JSON.stringify(lastCommit.author));
+ return $detail;
+ }, alignment);
}
-
- $row.children(".last-commit.author").empty().append(html);
- $row.children(".last-commit.when").append("<span>" + lastCommit.when + "</span>");
- $row.children(".last-commit.message").append("<a href='" + lastCommit.url + "'>" + lastCommit.summary + "</a>");
- }
- });
+ });
+ }
+ }
+ });
+
+ $folderView.on("getViewState", function(e) {
+ return {scroll:{left: $folderView.scrollLeft(), top: $folderView.scrollTop()}};
+ });
+
+ $folderView.on("setViewState", function(e, viewState) {
+ if (viewState.scroll) {
+ $folderView.scrollLeft(viewState.scroll.left);
+ $folderView.scrollTop(viewState.scroll.top);
}
- }
- });
-
- $folderView.on("getViewState", function(e) {
- return {scroll:{left: $folderView.scrollLeft(), top: $folderView.scrollTop()}};
- });
-
- $folderView.on("setViewState", function(e, viewState) {
- if (viewState.scroll) {
- $folderView.scrollLeft(viewState.scroll.left);
- $folderView.scrollTop(viewState.scroll.top);
- }
- });
-
- $folderView.on("autofit", function(e, width, height) {
- $folderView.outerWidth(width);
- $folderView.outerHeight(height);
- });
+ });
+
+ $folderView.on("autofit", function(e, width, height) {
+ $folderView.outerWidth(width);
+ $folderView.outerHeight(height);
+ });
+ },
+
+ onUserDetailAvailable: function() {
+ var $userDetail = $("#user-detail");
+ $userDetail.empty().append($(".user-detail-content").children()).show();
+ $userDetail.align({placement: $userDetail.data("alignment"), target: {element: $userDetail.data("trigger")}});
+ }
};
\ No newline at end of file
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.java
index 814223cac5..64ed3ffcdf 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
@@ -61,7 +61,7 @@ import io.onedev.server.web.component.createtag.CreateTagLink;
import io.onedev.server.web.component.diff.revision.CommentSupport;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.user.avatar.ContributorAvatars;
+import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
index 0595a581d4..16443e0358 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
@@ -5,7 +5,7 @@
<div class="head">
<form wicket:id="query" class="query no-autofocus clearable-wrapper">
<div class="input-group">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Filter by branch, tag, commit id, file path, date, user or commit message"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Filter by branch, tag, commit id, file path, date, user or commit message">
<span class="input-group-btn">
<button wicket:id="submit" type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>
</span>
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.java
index ddcaa46d8e..7a0e9c4b17 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
@@ -71,7 +71,7 @@ import io.onedev.server.web.component.commit.message.ExpandableCommitMessagePane
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.user.avatar.ContributorAvatars;
+import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index 11fa2d8a8f..632ada5eaa 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -28,14 +28,16 @@ import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.IssueField;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.modal.ModalPanel.Size;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.avatar.UserAvatar;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
@@ -107,9 +109,9 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
.findByName(field.getValues().iterator().next());
if (user != null) {
String tooltip = field.getName() + ": " + user.getDisplayName();
- Link<Void> link = new UserAvatarLink(avatarsView.newChildId(), user, null);
- link.add(AttributeAppender.append("title", tooltip));
- avatarsView.add(link);
+ UserAvatar avatar = new UserAvatar(avatarsView.newChildId(), UserIdent.of(UserFacade.of(user)));
+ avatar.add(AttributeAppender.append("title", tooltip));
+ avatarsView.add(avatar);
}
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
index 85b3ae2495..68d2a76d08 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
@@ -1,8 +1,7 @@
<wicket:panel>
<div wicket:id="content" class="content">
<div wicket:id="head" class="head clearfix">
- <a wicket:id="avatarLink" class="pull-left"></a>
- <a wicket:id="userLink" class="pull-left"></a>
+ <a wicket:id="userIdent" class="pull-left"></a>
<span wicket:id="title" class="pull-left"></span>
<span wicket:id="count" class="badge pull-left"></span>
<a wicket:id="addCard" title="Add new card to this column" class="add-card pull-right"><i class="fa fa-plus"></i></a>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index 3e3cd8e49b..e5ee4475f4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -51,15 +51,17 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.issues.list.IssueListPage;
import io.onedev.server.web.util.ComponentContext;
@@ -235,12 +237,10 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
WebMarkupContainer head = new WebMarkupContainer("head");
if (user != null) {
head.add(new WebMarkupContainer("title").setVisible(false));
- head.add(new UserAvatarLink("avatarLink", user));
- head.add(new UserLink("userLink", user));
+ head.add(new UserIdentPanel("userIdent", UserIdent.of(UserFacade.of(user)), Mode.AVATAR_AND_NAME));
} else {
head.add(new Label("title", title));
- head.add(new WebMarkupContainer("avatarLink").setVisible(false));
- head.add(new WebMarkupContainer("userLink").setVisible(false));
+ head.add(new WebMarkupContainer("userIdent").setVisible(false));
}
head.add(AttributeAppender.append("title", getBoard().getIdentifyField()));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/project.css b/core/src/main/java/io/onedev/server/web/page/project/project.css
index 1eeac4ecd5..26b916d1ec 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/project.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/project.css
@@ -1,14 +1,14 @@
#project>.sidebar>.head a {
display: block;
border-bottom: 2px solid #E0E0E0;
- padding: 6px 22px 6px 4px;
+ padding: 10px 22px 10px 4px;
font-size: 16px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
text-decoration: none;
color: #444;
- height: 46px;
+ height: 50px;
}
#project>.sidebar>.head a:hover {
background: #EEE;
@@ -20,20 +20,20 @@
#project>.sidebar>.head i {
position: absolute;
right: 4px;
- top: 14px;
+ top: 16px;
}
#project>.sidebar>.tabs {
- top: 46px;
+ top: 50px;
}
#project>.minimized.sidebar>.head a {
- height: 60px;
+ height: 64px;
}
#project>.minimized.sidebar>.head span {
display: none;
}
#project>.minimized.sidebar>.head i {
left: 14px;
- top: 38px;
+ top: 43px;
}
#project>.minimized.sidebar>.tabs {
top: 60px;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 37ff2fddea..65bd1f357b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -55,12 +55,12 @@ import io.onedev.server.persistence.dao.Dao;
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.component.branch.BranchLink;
import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;
import io.onedev.server.web.component.build.status.PullRequestBuildsPanel;
import io.onedev.server.web.component.commit.list.CommitListPanel;
import io.onedev.server.web.component.diff.revision.CommentSupport;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
-import io.onedev.server.web.component.link.BranchLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index 747f4079bd..62bb6e2abe 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -5,7 +5,7 @@
<div wicket:id="title" class="title pull-left"></div>
<a wicket:id="editLink" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>
<form wicket:id="editForm" class="pull-left form-inline clearable-wrapper">
- <input wicket:id="title" type="text" placeholder="Input title" class="form-control"></input>
+ <input wicket:id="title" type="text" placeholder="Input title" class="form-control">
<input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/>
<input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>
</form>
@@ -40,7 +40,7 @@
</div>
<div wicket:id="mergeStatus" class="merge-status">
<div wicket:id="calculating" class="calculating alert alert-warning">
- <img src="/img/ajax-indicator-big.gif"></img> Calculating merge preview...
+ <img src="/img/ajax-indicator-big.gif"> Calculating merge preview...
</div>
<div wicket:id="noConflict" class="no-conflict alert alert-success">
<label><i class="fa fa-check-circle"></i> Able to merge without conflicts</label>
@@ -112,8 +112,8 @@
<div wicket:id="feedback"></div>
<form wicket:id="form" class="leave-confirm">
<div wicket:id="note"></div>
- <input wicket:id="submit" type="submit" value="Confirm" class="btn"></input>
- <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"></input>
+ <input wicket:id="submit" type="submit" value="Confirm" class="btn">
+ <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default">
</form>
</wicket:fragment>
<wicket:fragment wicket:id="codeCommentsTabLinkFrag">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 411eb71ccd..752aa45c5a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -76,7 +76,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.model.PullRequestWatch;
-import io.onedev.server.model.User;
import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.ProjectAndBranch;
@@ -86,13 +85,13 @@ import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.build.status.PullRequestBuildsPanel;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.BranchLink;
import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
@@ -101,6 +100,8 @@ import io.onedev.server.web.component.tabbable.PageTab;
import io.onedev.server.web.component.tabbable.PageTabLink;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
@@ -112,6 +113,7 @@ import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.ProjectAttachmentSupport;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.util.model.EntityModel;
@@ -634,8 +636,8 @@ public abstract class PullRequestDetailPage extends ProjectPage {
});
- statusAndBranchesContainer.add(new UserLink("user",
- User.getForDisplay(request.getSubmitter(), request.getSubmitterName())));
+ UserIdent userIdent = UserIdent.of(UserFacade.of(request.getSubmitter()), request.getSubmitterName());
+ statusAndBranchesContainer.add(new UserIdentPanel("user", userIdent, Mode.NAME));
statusAndBranchesContainer.add(new Label("date", DateUtils.formatAge(request.getSubmitDate())));
statusAndBranchesContainer.add(new BranchLink("target", request.getTarget(), null));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index f87aaf14e8..25ece4833b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -47,7 +47,8 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferenc
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestChangeActivity;
import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestCommentedActivity;
@@ -102,7 +103,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
if (anchor != null)
row.setMarkupId(anchor);
- row.add(new UserAvatarLink("avatar", activity.getUser(), activity.getUser()!=null?activity.getUser().getDisplayName():"OneDev"));
+ row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));
Component content = activity.render("content", new DeleteCallback() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivity.java
index b781010e57..380e12b2cd 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivity.java
@@ -7,8 +7,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
-import io.onedev.server.model.User;
import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.util.userident.UserIdent;
public interface PullRequestActivity extends Serializable {
@@ -16,8 +16,7 @@ public interface PullRequestActivity extends Serializable {
Component render(String componentId, DeleteCallback deleteCallback);
- @Nullable
- User getUser();
+ UserIdent getUser();
@Nullable
String getAnchor();
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
index df4db424bb..aa5fa5dc87 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
@@ -8,9 +8,10 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.PullRequestChangeManager;
import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.model.User;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public class PullRequestChangeActivity implements PullRequestActivity {
@@ -48,8 +49,8 @@ public class PullRequestChangeActivity implements PullRequestActivity {
}
@Override
- public User getUser() {
- return User.getForDisplay(getChange().getUser(), getChange().getUserName());
+ public UserIdent getUser() {
+ return UserIdent.of(UserFacade.of(getChange().getUser()), getChange().getUserName());
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
index 44a03ec4b4..a77b239e6b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
@@ -7,9 +7,10 @@ import org.apache.wicket.model.IModel;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.model.User;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.SystemUserIdent;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;
@SuppressWarnings("serial")
@@ -24,8 +25,8 @@ class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
super.onInitialize();
PullRequestChange change = getModelObject();
- User userForDisplay = User.getForDisplay(change.getUser(), change.getUserName());
- add(new UserLink("user", userForDisplay).setVisible(userForDisplay != null));
+ UserIdent userIdent = UserIdent.of(UserFacade.of(change.getUser()), change.getUserName());
+ add(new Label("user", userIdent.getName()).setVisible(!(userIdent instanceof SystemUserIdent)));
add(new Label("description", change.getData().getDescription()));
add(new Label("age", DateUtils.formatAge(change.getDate())));
add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
index 3cece18157..15cfcfdaef 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
@@ -9,9 +9,10 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.PullRequestCommentManager;
import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.model.User;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public class PullRequestCommentedActivity implements PullRequestActivity {
@@ -56,8 +57,8 @@ public class PullRequestCommentedActivity implements PullRequestActivity {
}
@Override
- public User getUser() {
- return User.getForDisplay(getComment().getUser(), getComment().getUserName());
+ public UserIdent getUser() {
+ return UserIdent.of(UserFacade.of(getComment().getUser()), getComment().getUserName());
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
index b7af3566b6..5504f9cf39 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
@@ -11,10 +11,10 @@ import io.onedev.server.manager.PullRequestCommentManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
@@ -36,7 +36,8 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
protected void onInitialize() {
super.onInitialize();
- add(new UserLink("user", User.getForDisplay(getComment().getUser(), getComment().getUserName())));
+ UserIdent userIdent = UserIdent.of(UserFacade.of(getComment().getUser()), getComment().getUserName());
+ add(new Label("user", userIdent.getName()));
add(new Label("age", DateUtils.formatAge(getComment().getDate())));
add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java
index 436ec3eb06..8d5c14d9fe 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java
@@ -8,9 +8,10 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public class PullRequestOpenedActivity implements PullRequestActivity {
@@ -48,8 +49,8 @@ public class PullRequestOpenedActivity implements PullRequestActivity {
}
@Override
- public User getUser() {
- return User.getForDisplay(getRequest().getSubmitter(), getRequest().getSubmitterName());
+ public UserIdent getUser() {
+ return UserIdent.of(UserFacade.of(getRequest().getSubmitter()), getRequest().getSubmitterName());
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
index b22ff097d9..28fb8f0936 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
@@ -10,10 +10,10 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.PullRequestChangeManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
@@ -33,7 +33,8 @@ class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
super.onInitialize();
PullRequest request = getPullRequest();
- add(new UserLink("user", User.getForDisplay(request.getSubmitter(), request.getSubmitterName())));
+ UserIdent userIdent = UserIdent.of(UserFacade.of(request.getSubmitter()), request.getSubmitterName());
+ add(new Label("user", userIdent.getName()));
add(new Label("age", DateUtils.formatAge(request.getSubmitDate())));
add(new ProjectCommentPanel("body") {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java
index 0fa8223dae..28a633c3ed 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java
@@ -7,10 +7,11 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.model.PullRequestUpdate;
-import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public class PullRequestUpdatedActivity implements PullRequestActivity {
@@ -48,8 +49,8 @@ public class PullRequestUpdatedActivity implements PullRequestActivity {
}
@Override
- public User getUser() {
- return null;
+ public UserIdent getUser() {
+ return UserIdent.of(UserFacade.of(null));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
index 1c771b522f..0bcc2b3b6c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
@@ -30,9 +30,11 @@ import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.build.status.BuildsStatusPanel;
import io.onedev.server.web.component.commit.message.ExpandableCommitMessagePanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.user.avatar.UserAvatarLink;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
@@ -73,7 +75,7 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
protected void populateItem(final ListItem<RevCommit> item) {
RevCommit commit = item.getModelObject();
- item.add(new UserAvatarLink("author", commit.getAuthorIdent(), commit.getAuthorIdent().getName()));
+ item.add(new UserIdentPanel("author", UserIdent.of(commit.getAuthorIdent()), Mode.AVATAR));
IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
index eb5b8dda38..14617db688 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
@@ -53,8 +53,8 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
+import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
-import io.onedev.server.web.component.link.BranchLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
import io.onedev.server.web.page.project.ProjectPage;
diff --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.java
index 719b3f810b..1f6866f4a7 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,6 +13,7 @@ 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.avatar.AvatarEditPage;
import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;
import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;
@@ -24,9 +25,6 @@ import io.onedev.server.web.page.project.setting.issueworkflow.fields.IssueField
import 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.setting.webhook.WebHooksPage;
@SuppressWarnings("serial")
@@ -52,7 +50,7 @@ public abstract class ProjectSettingPage extends ProjectPage {
List<PageTab> tabs = new ArrayList<>();
tabs.add(new ProjectSettingTab("General Setting", "fa fa-fw fa-sliders", GeneralSettingPage.class));
tabs.add(new ProjectSettingTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));
- tabs.add(new ProjectSettingTab("Teams", "fa fa-fw fa-group", TeamListPage.class, NewTeamPage.class, TeamEditPage.class));
+ tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.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.html
new file mode 100644
index 0000000000..7c81d78afd
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html
@@ -0,0 +1,20 @@
+<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">
+ </div>
+ <div class="pull-left">
+ <input wicket:id="addNew" type="hidden" class="form-control">
+ </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="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 file
diff --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.java
new file mode 100644
index 0000000000..80ffd010c5
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
@@ -0,0 +1,501 @@
+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.SecurityUtils;
+import io.onedev.server.security.permission.ProjectPrivilege;
+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.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.project.privilege.selection.PrivilegeSelectionPanel;
+import io.onedev.server.web.component.project.privilege.source.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.user.choice.AbstractUserChoiceProvider;
+import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
+import io.onedev.server.web.page.project.setting.ProjectSettingPage;
+import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.utils.WordUtils;
+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.ADMINISTRATION);
+ 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.ADMINISTRATION);
+ 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().getDefaultPrivilege() != null) {
+ for (UserFacade user: cacheManager.getUsers().values()) {
+ ProjectPrivilege userPrivilege = userAuthorizations.get(user.getId());
+ if (userPrivilege == null || getProject().getDefaultPrivilege().getProjectPrivilege().implies(userPrivilege))
+ userAuthorizations.put(user.getId(), getProject().getDefaultPrivilege().getProjectPrivilege());
+ 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) {
+ UserIdent userIdent = UserIdent.of(UserFacade.of(OneDev.getInstance(UserManager.class).load(rowModel.getObject())));
+ cellItem.add(new UserIdentPanel(componentId, userIdent, Mode.AVATAR_AND_NAME));
+ }
+ });
+
+ 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 WordUtils.toWords(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/project-setting.css b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
index add11908cb..1edca961d8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
@@ -8,13 +8,18 @@
/* use hacks below to make the sidebar extend to the screen bottom even if body does not reach to the bottom */
margin-bottom: -10000px;
padding-bottom: 10000px;
+ width: 260px;
}
#project-setting>.sidebar>.tabs>li>a {
border-left: none;
+ padding: 12px 14px;
}
#project>.minimized.sidebar+.content>#project-setting>.sidebar {
left: 44px;
}
+#project-setting>.sidebar+.content {
+ padding-left: 260px;
+}
#project-setting .general-setting form .delete {
margin-right: 0;
}
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.java
deleted file mode 100644
index 37fd7d4c47..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/team/MembersEditBean.java
+++ /dev/null
@@ -1,27 +0,0 @@
-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.html
deleted file mode 100644
index 979222132a..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/team/NewTeamPage.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<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 file
diff --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.java
deleted file mode 100644
index c75d06f3d5..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/team/NewTeamPage.java
+++ /dev/null
@@ -1,89 +0,0 @@
-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.java
deleted file mode 100644
index c698401cf8..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-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.html
deleted file mode 100644
index 3e0237003d..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamEditPage.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<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 file
diff --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.java
deleted file mode 100644
index c8d9b454f3..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamEditPage.java
+++ /dev/null
@@ -1,125 +0,0 @@
-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.html
deleted file mode 100644
index 8989c2a8ce..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<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/team.css b/core/src/main/java/io/onedev/server/web/page/project/setting/team/team.css
deleted file mode 100644
index cc06bfd948..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/team/team.css
+++ /dev/null
@@ -1,8 +0,0 @@
-#new-team>.head {
- font-size: 18px;
- margin-bottom: 20px;
- font-weight: bold;
-}
-.team.list .actions a {
- color: #666;
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
index ada680f419..7f7bc5b27e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
@@ -12,4 +12,5 @@
<div class="overall chart"></div>
<div class="top-contributors container-fluid"></div>
</div>
+ <div wicket:id="userDetail" class="user-detail-content"></div>
</wicket:extend>
\ No newline at end of file
diff --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.java
index d0526a0cc0..7cfc1227c1 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
@@ -1,11 +1,18 @@
package io.onedev.server.web.page.project.stats;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.CallbackParameter;
import org.apache.wicket.markup.head.IHeaderResponse;
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.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -16,10 +23,17 @@ import io.onedev.server.git.Contribution;
import io.onedev.server.manager.CommitInfoManager;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Day;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.component.user.detail.UserDetailPanel;
@SuppressWarnings("serial")
public class ProjectContribsPage extends ProjectStatsPage {
+ private static final String USER_DETAIL_ID = "userDetail";
+
+ private AbstractDefaultAjaxBehavior userDetailBehavior;
+
public ProjectContribsPage(PageParameters params) {
super(params);
}
@@ -33,6 +47,25 @@ public class ProjectContribsPage extends ProjectStatsPage {
protected void onInitialize() {
super.onInitialize();
add(new Label("note", "Contributions to " + getProject().getDefaultBranch() + " branch, excluding merge commits"));
+ add(new WebMarkupContainer(USER_DETAIL_ID).setOutputMarkupId(true));
+ add(userDetailBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ String jsonOfUserIdent = RequestCycle.get().getRequest().getPostParameters().getParameterValue("userIdent").toString();
+ try {
+ UserIdent userIdent = OneDev.getInstance(ObjectMapper.class).readValue(jsonOfUserIdent, UserIdent.class);
+ Component userDetail = new UserDetailPanel(USER_DETAIL_ID, userIdent);
+ userDetail.setOutputMarkupId(true);
+ replace(userDetail);
+ target.add(userDetail);
+ target.appendJavaScript("onedev.server.stats.contribs.onUserDetailAvailable();");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ });
}
@Override
@@ -56,7 +89,9 @@ public class ProjectContribsPage extends ProjectStatsPage {
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
- String script = String.format("onedev.server.stats.contribs.onDomReady(%s, '%s');", jsonOfData, topContributorsUrl);
+ CharSequence callback = userDetailBehavior.getCallbackFunction(CallbackParameter.explicit("userIdent"));
+ String script = String.format("onedev.server.stats.contribs.onDomReady(%s, '%s', %s);",
+ jsonOfData, topContributorsUrl, callback);
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java
index 435c600694..4d7278ecf5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java
@@ -9,6 +9,7 @@ import org.apache.wicket.request.resource.CssResourceReference;
import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;
import io.onedev.server.web.asset.echarts.EChartsResourceReference;
+import io.onedev.server.web.asset.hover.HoverResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class ProjectStatsResourceReference extends BaseDependentResourceReference {
@@ -24,6 +25,7 @@ public class ProjectStatsResourceReference extends BaseDependentResourceReferenc
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new EChartsResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
dependencies.add(CssHeaderItem.forReference(
new CssResourceReference(ProjectStatsResourceReference.class, "project-stats.css")));
return dependencies;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java b/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
index dd02808bf2..b2197263bd 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
@@ -8,10 +8,8 @@ import java.util.List;
import java.util.Map;
import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
-import org.eclipse.jgit.lib.PersonIdent;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -19,13 +17,11 @@ 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.manager.UserManager;
import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Day;
-import io.onedev.server.web.page.user.UserProfilePage;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.avatar.AvatarManager;
class TopContributorsResource extends AbstractResource {
@@ -63,22 +59,14 @@ class TopContributorsResource extends AbstractResource {
List<Contributor> topContributors = OneDev.getInstance(CommitInfoManager.class).getTopContributors(project, TOP_CONTRIBUTORS, type, fromDay, toDay);
- UserManager userManager = OneDev.getInstance(UserManager.class);
AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);
List<Map<String, Object>> data = new ArrayList<>();
for (Contributor contributor: topContributors) {
Map<String, Object> contributorData = new HashMap<>();
- PersonIdent author = contributor.getAuthor();
- User user = userManager.find(author);
- if (user != null) {
- contributorData.put("authorName", user.getDisplayName());
- contributorData.put("authorAvatarUrl", avatarManager.getAvatarUrl(user.getFacade()));
- contributorData.put("authorUrl", RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(user)));
- } else {
- contributorData.put("authorName", author.getName());
- contributorData.put("authorAvatarUrl", avatarManager.getAvatarUrl(author));
- }
+ UserIdent userIdent = UserIdent.of(contributor.getAuthor(), "Git author");
+ contributorData.put("author", userIdent);
+ contributorData.put("authorAvatarUrl", avatarManager.getAvatarUrl(userIdent));
contributorData.put("totalCommits", contributor.getTotalContribution().getCommits());
contributorData.put("totalAdditions", contributor.getTotalContribution().getAdditions());
contributorData.put("totalDeletions", contributor.getTotalContribution().getDeletions());
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
index 3360cc482c..f85cff8ea2 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
@@ -38,6 +38,7 @@
top: 0;
width: 40px;
height: 40px;
+ border-radius: 1000px;
}
#project-contribs .top-contributors .row>div {
padding: 0;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
index b925b25275..4c97005ceb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
@@ -13,7 +13,7 @@ onedev.server.stats = {
return date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
},
contribs: {
- onDomReady : function(overallContributions, topContributorsDataUrl) {
+ onDomReady : function(overallContributions, topContributorsDataUrl, userDetailCallback) {
var $contribs = $("#project-contribs");
var $overall = $contribs.find(".overall");
if (overallContributions.length == 0) {
@@ -184,8 +184,24 @@ onedev.server.stats = {
$content.append($head);
var $left = $("<div class='pull-left'></div>");
$head.append($left);
- $left.append("<img class='avatar' src='" + contributor.authorAvatarUrl + "'></img>");
- var nameSpan = "<span class='name'>" + contributor.authorName + "</span>";
+ if (contributor.author["@class"].indexOf("SystemUserIdent") != -1) {
+ $left.append("<img class='avatar' src='" + contributor.authorAvatarUrl + "'></img>");
+ } else {
+ $left.append("<a class='user'><img class='avatar' src='" + contributor.authorAvatarUrl + "'></img></a>");
+ }
+
+ var alignment = {targetX: 0, targetY: 0, x: 0, y: 100, offset: 8};
+ $left.find("a.user").hover(function() {
+ var $detail = $("<div id='user-detail' class='floating'></div>");
+ $detail.hide();
+ $detail.data("trigger", this);
+ $detail.data("alignment", alignment);
+ $("body").append($detail);
+ userDetailCallback(JSON.stringify(contributor.author));
+ return $detail;
+ }, alignment);
+
+ var nameSpan = "<span class='name'>" + contributor.author.name + "</span>";
if (contributor.authorUrl) {
$left.append("<a href='" + contributor.authorUrl + "'>" + nameSpan + "</a>");
} else {
@@ -293,6 +309,11 @@ onedev.server.stats = {
$(this).data("chart").resize();
});
});
+ },
+ onUserDetailAvailable: function() {
+ var $userDetail = $("#user-detail");
+ $userDetail.empty().append($(".user-detail-content").children()).show();
+ $userDetail.align({placement: $userDetail.data("alignment"), target: {element: $userDetail.data("trigger")}});
}
},
sourceLines: {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
index 72bb69b9b3..28e77922e7 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
@@ -4,7 +4,7 @@
<div class="list">
<div class="head clearfix">
<div class="pull-left clearable-wrapper">
- <input wicket:id="searchTags" class="form-control search" placeholder="Search tags"></input>
+ <input wicket:id="searchTags" class="form-control search" placeholder="Search tags">
</div>
<div class="pull-left">
<a wicket:id="createTag" class="btn btn-success"><i class="fa fa-plus"></i> Create Tag</a>
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.java
index c77fcb5d1d..c908dad617 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
@@ -47,15 +47,17 @@ import io.onedev.server.web.component.build.status.BuildsStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.link.ArchiveMenuLink;
-import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.revisionpicker.RevisionPicker;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.ProjectPage;
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;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
import io.onedev.utils.StringUtils;
@@ -278,7 +280,7 @@ public class ProjectTagsPage extends ProjectPage {
RevTag revTag = (RevTag) ref.getObj();
Fragment fragment = new Fragment("annotated", "annotatedFrag", ProjectTagsPage.this);
if (revTag.getTaggerIdent() != null) {
- fragment.add(new UserLink("author", revTag.getTaggerIdent()));
+ fragment.add(new UserIdentPanel("author", UserIdent.of(revTag.getTaggerIdent()), Mode.NAME));
} else {
fragment.add(new WebMarkupContainer("author").setVisible(false));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.html b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.html
index 8f97532cca..9a760c0fb3 100644
--- a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.html
@@ -1,10 +1,10 @@
<wicket:extend>
<div id="register" class="center-box">
- <h1><img src="/img/logo.png" class="logo"></img> Register User</h1>
+ <h1><img src="/img/logo.png" class="logo"> Register User</h1>
<form wicket:id="form">
<div wicket:id="editor"></div>
<div class="actions">
- <input wicket:id="save" class="btn btn-primary" value="Register" type="submit"></input>
+ <input wicket:id="save" class="btn btn-primary" value="Register" type="submit">
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
</form>
diff --git a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
index 2ee9274ec4..77680aece1 100644
--- a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
@@ -16,10 +16,10 @@ import io.onedev.server.security.SecurityUtils;
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.admin.user.UserAvatarPage;
+import io.onedev.server.web.page.admin.user.UserPage;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.ProjectListPage;
-import io.onedev.server.web.page.user.AvatarEditPage;
-import io.onedev.server.web.page.user.UserPage;
@SuppressWarnings("serial")
public class RegisterPage extends BasePage {
@@ -60,7 +60,7 @@ public class RegisterPage extends BasePage {
userManager.save(user, null);
Session.get().success("New user registered");
SecurityUtils.getSubject().runAs(user.getPrincipals());
- setResponsePage(AvatarEditPage.class, UserPage.paramsOf(user));
+ setResponsePage(UserAvatarPage.class, UserPage.paramsOf(user));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index 86c9831801..b47194918b 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,6 +1,2 @@
<wicket:extend>
- <form wicket:id="form">
- <div wicket:id="avatar" style="margin-bottom: 20px;"></div>
- <input type="submit" class="form-control" value="Save">
- </form>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 06e2314516..8af456aaf3 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,39 +1,17 @@
package io.onedev.server.web.page.test;
-import java.io.File;
-
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.form.Form;
-import org.apache.wicket.model.Model;
-import io.onedev.server.web.component.avatarupload.AvatarUploadField;
import io.onedev.server.web.page.base.BasePage;
@SuppressWarnings("serial")
public class TestPage extends BasePage {
- private AvatarUploadField avatarUpload;
-
@Override
protected void onInitialize() {
super.onInitialize();
-
- String avatarData = AvatarUploadField.readFromFile(new File("w:\\temp\\avatar.jpg"));
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
- AvatarUploadField.writeToFile(new File("w:\\temp\\avatar.jpg"), avatarUpload.getModelObject());
- }
-
- };
- form.add(avatarUpload = new AvatarUploadField("avatar", Model.of(avatarData)));
- avatarUpload.setRequired(true);
-
- add(form);
}
@Override
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.html
deleted file mode 100644
index 496d7f8221..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<wicket:extend>
- <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">
- <label> <input wicket:id="continueToAdd" type="checkbox"> Continue to add other user after create</label>
- </div>
- </div>
- </form>
- </div>
-</wicket:extend>
\ No newline at end of file
diff --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.html
deleted file mode 100644
index 8864a3ae74..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<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">&times;</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 file
diff --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.java
deleted file mode 100644
index 2ca67183d4..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.java
+++ /dev/null
@@ -1,422 +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.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.LoadableDetachableDataProvider;
-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.project.choice.AbstractProjectChoiceProvider;
-import io.onedev.server.web.component.project.choice.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 LoadableDetachableDataProvider<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 calcSize() {
- 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/TeamsEditBean.java b/core/src/main/java/io/onedev/server/web/page/user/TeamsEditBean.java
deleted file mode 100644
index e644c90ac1..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/user/TeamsEditBean.java
+++ /dev/null
@@ -1,27 +0,0 @@
-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/UserProfilePage.html b/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.html
deleted file mode 100644
index 43b437dc62..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/user/UserProfilePage.html
+++ /dev/null
@@ -1,28 +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>
- <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>
- </div>
- </form>
- </wicket:fragment>
-</wicket:extend>
\ No newline at end of file
diff --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.css
deleted file mode 100644
index 6ad558ff35..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/user/user.css
+++ /dev/null
@@ -1,64 +0,0 @@
-#user>.sidebar>.head {
- border-bottom: 2px solid #E0E0E0;
- padding: 6px 22px 6px 4px;
- font-size: 16px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- height: 46px;
-}
-#user>.sidebar>.tabs {
- top: 46px;
-}
-#user>.sidebar>.head img {
- height: 32px;
- width: 32px;
-}
-#user>.minimized.sidebar>.head>span {
- display: none;
-}
-
-#user .project.list .head .select2-container {
- width: 240px;
-}
-#user .project.list table a {
- color: #666;
- margin-left: 4px;
-}
-
-#user .avatar-edit .title {
- margin-bottom: 20px;
- font-size: 18px;
- font-weight: bold;
-}
-#user .avatar-edit>.current {
- margin-bottom: 20px;
- padding-bottom: 20px;
- border-bottom: 1px solid #E8E8E8;
-}
-#user .avatar-edit .current img {
- height: 240px;
- width: 240px;
- display: block;
-}
-#user .avatar-edit .current a {
- margin-top: 20px;
-}
-#user .avatar-edit form>button {
- margin-top: 20px;
-}
-
-.user.list .actions a {
- color: #666;
-}
-.new-user .actions .btn {
- margin-right: 20px;
-}
-
-.token-generate .token-value {
- margin-top: 20px;
-}
-.token-generate .token-value a {
- color: #444;
- margin-left: 4px;
-}
\ No newline at end of file
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.java
index 32dce077a4..0a724ee20f 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
@@ -23,11 +23,12 @@ import io.onedev.server.git.RefInfo;
import io.onedev.server.manager.BuildManager;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.CommitInfoManager;
+import io.onedev.server.manager.GroupManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Build;
+import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-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.ConfigurationFacade;
@@ -159,11 +160,11 @@ public class SuggestionUtils {
return suggestions;
}
- public static List<InputSuggestion> suggestTeam(Project project, String matchWith, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestGroup(String matchWith, @Nullable String escapeChars) {
matchWith = matchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
- for (Team team: project.getTeams()) {
- String name = team.getName();
+ for (Group group: OneDev.getInstance(GroupManager.class).query()) {
+ String name = group.getName();
int index = name.toLowerCase().indexOf(matchWith);
if (index != -1) {
Range match = new Range(index, index+matchWith.length());
diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java b/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java
index c06e647602..cf15f6f10c 100644
--- a/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java
+++ b/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java
@@ -4,35 +4,16 @@ import java.io.File;
import javax.annotation.Nullable;
-import org.eclipse.jgit.lib.PersonIdent;
-
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
public interface AvatarManager {
- /**
- * Get URL of user avatar image.
- *
- * @param user
- * user to get avatar for
- * @return
- * url of avatar image. This url will be relative to context root if gravatar is disabled
- */
- String getAvatarUrl(@Nullable UserFacade user);
+ String getAvatarUrl(UserIdent userIdent);
String getAvatarUrl(ProjectFacade project);
- /**
- * Get URL of avatar image of specified person.
- *
- * @param person
- * person to get avatar for
- * @return
- * url of avatar image. This url will be relative to context root if gravatar is disabled
- */
- String getAvatarUrl(PersonIdent person);
-
void useAvatar(UserFacade user, @Nullable String avatarData);
void useAvatar(ProjectFacade project, @Nullable String avatarData);
diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java b/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java
index 06fb576bc0..3d8d745815 100644
--- a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java
+++ b/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java
@@ -6,23 +6,26 @@ import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.util.concurrent.locks.Lock;
-import javax.annotation.Nullable;
import javax.imageio.ImageIO;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.commons.codec.binary.Hex;
-import org.eclipse.jgit.lib.PersonIdent;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
import io.onedev.launcher.bootstrap.Bootstrap;
-import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
+import io.onedev.server.manager.UserManager;
+import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.EmailAwareIdent;
+import io.onedev.server.util.userident.RemovedUserIdent;
+import io.onedev.server.util.userident.SystemUserIdent;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.avatarupload.AvatarUploadField;
import io.onedev.utils.FileUtils;
import io.onedev.utils.LockUtils;
@@ -35,30 +38,35 @@ public class DefaultAvatarManager implements AvatarManager {
private static final String AVATARS_BASE_URL = "/site/avatars/";
- private final SettingManager configManager;
+ private final SettingManager settingManager;
+
+ private final UserManager userManager;
@Inject
- public DefaultAvatarManager(SettingManager configManager) {
- this.configManager = configManager;
+ public DefaultAvatarManager(SettingManager settingManager, UserManager userManager) {
+ this.settingManager = settingManager;
+ this.userManager = userManager;
}
@Sessional
@Override
- public String getAvatarUrl(@Nullable UserFacade user) {
- if (user == null) {
+ public String getAvatarUrl(UserIdent userIdent) {
+ if (userIdent instanceof SystemUserIdent) {
return AVATARS_BASE_URL + "onedev.png";
- } else if (user.getId() == null) {
+ } else if (userIdent instanceof RemovedUserIdent) {
return AVATARS_BASE_URL + "user.png";
} else {
- File avatarFile = getUploaded(user);
- if (avatarFile.exists()) {
- return AVATARS_BASE_URL + "uploaded/users/" + user.getId() + ".jpg?version=" + avatarFile.lastModified();
+ EmailAwareIdent emailAwareIdent = (EmailAwareIdent) userIdent;
+ User user = userManager.findByEmail(emailAwareIdent.getEmail());
+ if (user != null) {
+ File uploadedFile = getUploaded(user.getFacade());
+ if (uploadedFile.exists())
+ return AVATARS_BASE_URL + "uploaded/users/" + user.getId() + ".jpg?version=" + uploadedFile.lastModified();
}
-
- if (configManager.getSystemSetting().isGravatarEnabled())
- return Gravatar.getURL(user.getEmail(), GRAVATAR_SIZE);
+ if (settingManager.getSystemSetting().isGravatarEnabled())
+ return Gravatar.getURL(emailAwareIdent.getEmail(), GRAVATAR_SIZE);
else
- return generateAvatar(user.getDisplayName(), user.getEmail());
+ return generateAvatar(userIdent.getName(), emailAwareIdent.getEmail());
}
}
@@ -88,16 +96,6 @@ public class DefaultAvatarManager implements AvatarManager {
return AVATARS_BASE_URL + "generated/" + encoded + ".png";
}
-
- @Override
- public String getAvatarUrl(PersonIdent person) {
- if (person.getEmailAddress().length() == 0 && person.getName().equals(OneDev.NAME))
- return AVATARS_BASE_URL + "onedev.png";
- else if (configManager.getSystemSetting().isGravatarEnabled())
- return Gravatar.getURL(person.getEmailAddress(), GRAVATAR_SIZE);
- else
- return generateAvatar(person.getName(), person.getEmailAddress());
- }
private String getLetter(String name) {
String[] tokens = Iterables.toArray(Splitter.on(" ").split(name.trim()), String.class);
diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java
index 72970f02cc..37637d6b0b 100644
--- a/core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java
+++ b/core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java
@@ -7,7 +7,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.util.markdown.MarkdownProcessor;
import io.onedev.server.util.markdown.MentionParser;
-import io.onedev.server.web.page.user.UserProfilePage;
+import io.onedev.server.web.page.admin.user.UserProfilePage;
public class MentionProcessor extends MentionParser implements MarkdownProcessor {
diff --git a/product/src/test/java/io/onedev/server/product/Test.java b/product/src/test/java/io/onedev/server/product/Test.java
index 80b25e09ab..25b80b8b77 100644
--- a/product/src/test/java/io/onedev/server/product/Test.java
+++ b/product/src/test/java/io/onedev/server/product/Test.java
@@ -1,11 +1,11 @@
package io.onedev.server.product;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import java.io.IOException;
public class Test {
@org.junit.Test
- public void test() throws JsonProcessingException {
+ public void test() throws IOException {
}
}
\ No newline at end of file