New permissions UI for EditRepository (issue 36)

2 files changed, 102 insertions, 0 deletions

diff --git a/src/com/gitblit/models/TeamAccessPermission.java b/src/com/gitblit/models/TeamAccessPermission.java
new file mode 100644
index 00000000..23468c6d
--- /dev/null
+++ b/src/com/gitblit/models/TeamAccessPermission.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2012 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.models;
+
+import java.io.Serializable;
+
+import com.gitblit.Constants.AccessPermission;
+
+/**
+ * Represents a Team-AccessPermission tuple.
+ * 
+ * @author James Moger
+ */
+public class TeamAccessPermission implements Serializable, Comparable<TeamAccessPermission> {
+
+	private static final long serialVersionUID = 1L;
+
+	public String team;
+	public AccessPermission permission;
+
+	public TeamAccessPermission() {
+	}
+	
+	public TeamAccessPermission(String team, AccessPermission permission) {
+		this.team = team;
+		this.permission = permission;
+	}
+	
+	@Override
+	public int compareTo(TeamAccessPermission p) {
+		return team.compareTo(p.team);
+	}
+	
+	@Override
+	public String toString() {
+		return permission.asRole("@" + team);
+	}
+}
\ No newline at end of file
diff --git a/src/com/gitblit/models/UserAccessPermission.java b/src/com/gitblit/models/UserAccessPermission.java
new file mode 100644
index 00000000..a77fff29
--- /dev/null
+++ b/src/com/gitblit/models/UserAccessPermission.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2012 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.models;
+
+import java.io.Serializable;
+
+import com.gitblit.Constants.AccessPermission;
+
+/**
+ * Represents a User-AccessPermission tuple.
+ * 
+ * @author James Moger
+ */
+public class UserAccessPermission implements Serializable, Comparable<UserAccessPermission> {
+
+	private static final long serialVersionUID = 1L;
+
+	public String user;
+	public AccessPermission permission;
+
+	public UserAccessPermission() {
+	}
+	
+	public UserAccessPermission(String user, AccessPermission permission) {
+		this.user = user;
+		this.permission = permission;
+	}
+	
+	@Override
+	public int compareTo(UserAccessPermission p) {
+		return user.compareTo(p.user);
+	}
+	
+	@Override
+	public String toString() {
+		return permission.asRole(user);
+	}
+}
\ No newline at end of file