dcoraboeuf#282 Add a project promoter role

cpf · Nov 18, 2013 · d8ae748 · d8ae748
1 parent 8628790
commit d8ae748
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/ontrack-core/src/main/java/net/ontrack/core/security/ProjectFunction.java b/ontrack-core/src/main/java/net/ontrack/core/security/ProjectFunction.java
@@ -49,9 +49,9 @@ public enum ProjectFunction {
     // Delete build
     BUILD_DELETE,
     // Create promoted run
-    PROMOTED_RUN_CREATE(EnumSet.of(ProjectRole.OWNER), ImmutableSet.of(SecurityRoles.CONTROLLER)),
+    PROMOTED_RUN_CREATE(EnumSet.of(ProjectRole.OWNER, ProjectRole.PROMOTER), ImmutableSet.of(SecurityRoles.CONTROLLER)),
     // Delete promoted run
-    PROMOTED_RUN_DELETE,
+    PROMOTED_RUN_DELETE(EnumSet.of(ProjectRole.OWNER, ProjectRole.PROMOTER)),
     // Create validation run
     VALIDATION_RUN_CREATE(EnumSet.of(ProjectRole.OWNER), ImmutableSet.of(SecurityRoles.CONTROLLER)),
     // Delete validation run

diff --git a/ontrack-core/src/main/java/net/ontrack/core/security/ProjectRole.java b/ontrack-core/src/main/java/net/ontrack/core/security/ProjectRole.java
@@ -1,9 +1,14 @@
 package net.ontrack.core.security;
 
+/**
+ * Labels for roles are in <code>model.ls</code> and add also a <code>projectRole-*.png</code> in the images.
+ */
 public enum ProjectRole {
 
     OWNER,
 
-    VALIDATION_MANAGER
+    VALIDATION_MANAGER,
+
+    PROMOTER
 
 }
diff --git a/ontrack-core/src/main/resources/META-INF/strings/model.ls b/ontrack-core/src/main/resources/META-INF/strings/model.ls
@@ -189,3 +189,7 @@ projectRole.OWNER
 projectRole.VALIDATION_MANAGER
     en -> Validation manager
     fr -> Gestionnaire des validations
+
+projectRole.PROMOTER
+    en -> Promoter
+    fr -> Promoteur
diff --git a/ontrack-web/src/main/webapp/static/images/projectRole-PROMOTER.png b/ontrack-web/src/main/webapp/static/images/projectRole-PROMOTER.png