diff options
| author | James Moger <james.moger@gitblit.com> | 2012-10-23 22:27:56 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-10-23 22:27:56 -0400 |
| commit | 2d48e28bf1068b20129b2e3d5b96ecaff48f9f2f (patch) | |
| tree | 56e6d67109208abc47f8d808f590fdfb0cb24e06 /src | |
| parent | 1c817663269b52065b79eba37f29a5a4f67348d1 (diff) | |
| download | gitblit-2d48e28bf1068b20129b2e3d5b96ecaff48f9f2f.tar.gz gitblit-2d48e28bf1068b20129b2e3d5b96ecaff48f9f2f.zip | |
Implemented exclusion (X) permission
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/gitblit/Constants.java | 4 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/GitBlitWebApp.properties | 3 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/pages/BasePage.java | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java index 970c3db5..33cf2873 100644 --- a/src/com/gitblit/Constants.java +++ b/src/com/gitblit/Constants.java @@ -319,9 +319,9 @@ public class Constants { * The access permissions available for a repository.
*/
public static enum AccessPermission {
- NONE("N"), VIEW("V"), CLONE("R"), PUSH("RW"), CREATE("RWC"), DELETE("RWD"), REWIND("RW+");
+ NONE("N"), EXCLUDE("X"), VIEW("V"), CLONE("R"), PUSH("RW"), CREATE("RWC"), DELETE("RWD"), REWIND("RW+");
- public static final AccessPermission [] NEWPERMISSIONS = { VIEW, CLONE, PUSH, CREATE, DELETE, REWIND };
+ public static final AccessPermission [] NEWPERMISSIONS = { EXCLUDE, VIEW, CLONE, PUSH, CREATE, DELETE, REWIND };
public static AccessPermission LEGACY = REWIND;
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index 41cbdd46..09ee929b 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -348,7 +348,8 @@ gb.repositoryPermissions = repository permissions gb.userPermissions = user permissions
gb.teamPermissions = team permissions
gb.add = add
-gb.noPermission = NO ACCESS
+gb.noPermission = DELETE PERMISSION
+gb.excludePermission = {0} (exclude)
gb.viewPermission = {0} (view)
gb.clonePermission = {0} (clone)
gb.pushPermission = {0} (push)
diff --git a/src/com/gitblit/wicket/pages/BasePage.java b/src/com/gitblit/wicket/pages/BasePage.java index 48a872a8..dcca3619 100644 --- a/src/com/gitblit/wicket/pages/BasePage.java +++ b/src/com/gitblit/wicket/pages/BasePage.java @@ -212,6 +212,9 @@ public abstract class BasePage extends WebPage { case NONE:
map.put(type, MessageFormat.format(getString("gb.noPermission"), type.code));
break;
+ case EXCLUDE:
+ map.put(type, MessageFormat.format(getString("gb.excludePermission"), type.code));
+ break;
case VIEW:
map.put(type, MessageFormat.format(getString("gb.viewPermission"), type.code));
break;
|