Adding organism editor to user roles

src/main/java/no/nibio/vips/logic/entity/VipsLogicRole.java

@@ -52,6 +52,7 @@ public class VipsLogicRole implements Serializable {
     public static Integer OBSERVATION_AUTHORITY = 4;
     public static Integer MESSAGE_AUTHOR = 5;
     public static Integer APPLE_FRUIT_MOTH_ADMINISTRATOR = 6;
+    public static Integer ORGANISM_EDITOR = 7;
 
     private static final long serialVersionUID = 1L;
     @Id

src/main/java/no/nibio/vips/logic/entity/VipsLogicUser.java

@@ -296,6 +296,17 @@ public class VipsLogicUser implements Serializable {
         return false;
     }
     
+    @JsonIgnore
+    @Transient
+    public boolean isOrganismEditor() {
+        for (VipsLogicRole role : this.getVipsLogicRoles()) {
+            if (role.getVipsLogicRoleId().equals(VipsLogicRole.ORGANISM_EDITOR)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
     @JsonIgnore
     @Transient
     public boolean isAppleFruitMothAdministrator(){

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties

@@ -440,3 +440,4 @@ all=All
 isRequiredField=Required field
 crops=Crops
 unknownOrganismId=Unknown Organism Id
+vipsLogicRole_7=Organism editor

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties

@@ -440,3 +440,4 @@ all=All
 isRequiredField=Required field
 crops=Crops
 unknownOrganismId=Unknown Organism Id
+vipsLogicRole_7=Organism editor

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties

@@ -439,3 +439,4 @@ all=All
 isRequiredField=Required field
 crops=Crops
 unknownOrganismId=Unknown Organism Id
+vipsLogicRole_7=Organism editor

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties

@@ -440,3 +440,4 @@ all=Alle
 isRequiredField=Obligatorisk felt
 crops=Kulturer
 unknownOrganismId=Ukjent organismeId
+vipsLogicRole_7=Organismeredakt\u00f8r

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties

@@ -440,3 +440,4 @@ all=All
 isRequiredField=Required field
 crops=Crops
 unknownOrganismId=Unknown Organism Id
+vipsLogicRole_7=Organism editor

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties

@@ -437,3 +437,4 @@ all=All
 isRequiredField=Required field
 crops=Crops
 unknownOrganismId=Unknown Organism Id
+vipsLogicRole_7=Organism editor

src/main/webapp/templates/organismDetails.ftl

@@ -50,7 +50,7 @@
 	  </dd>
 	  
 	</dl>
-	<#if user.isSuperUser()>
+	<#if user.isSuperUser() || user.isOrganismEditor()>
 	<a href="/organism?action=editOrganismForm&organismId=${organism.organismId}" class="btn btn-default" role="button">${i18nBundle.edit}</a>
 	</#if>
 	<a href="/organism?action=listChildOrganisms&organismId=${organism.parentOrganismId!"null"}" class="btn btn-default" role="button">${i18nBundle.back}</a>

src/main/webapp/templates/organismList.ftl

@@ -28,7 +28,7 @@
         <#if messageKey?has_content>
 		<div class="alert alert-success">${i18nBundle(messageKey)}</div>
 	</#if>
-	<#if user.isSuperUser()>
+	<#if user.isSuperUser() || user.isOrganismEditor() >   
 	<a href="/organism?action=newOrganismForm&parentOrganismId=${organism.organismId!""}" class="btn btn-default" role="button">${i18nBundle.addNew}</a>
 	</#if>
 	<a href="/organism?action=listCrops" class="btn btn-default" role="button">${i18nBundle.listCrops}</a>
@@ -56,7 +56,7 @@
 		    	<td>${childOrganism.tradeName!""}</td>
 		    	</#if>
 		    	<td>
-		    		<#if user.isSuperUser()>
+		    		<#if user.isSuperUser() || user.isOrganismEditor() >
 		    			<a href="/organism?action=editOrganismForm&organismId=${childOrganism.organismId}&parentOrganismId=${organism.organismId!""}" class="btn btn-default" role="button">${i18nBundle.edit}</a>
 		    			<#if ! childOrganism.childOrganisms?has_content || childOrganism.childOrganisms?size == 0>
 		    			<button type="button" class="btn btn-danger" onclick="if(confirm('${childOrganism.getLocalName(currentLocale.language)!""}/${childOrganism.tradeName!""}/${childOrganism.latinName!""}: ${i18nBundle.confirmDelete}')) {window.location.href='/organism?action=deleteOrganism&organismId=${childOrganism.organismId}';}">${i18nBundle.delete}</button>
@@ -72,4 +72,4 @@
         </div>
 </div>
 </#macro>
-<@page_html/>
+<@page_html/>
\ No newline at end of file