Adding support for a super admin

Author: computate

src/main/java/org/computate/frFR/java/ConfigCles.java

@@ -89,6 +89,7 @@ public class ConfigCles {
 	public static final String var_Attribuer = "var_Attribuer";
 	public static final String var_AucunNomTrouve = "var_AucunNomTrouve";
 	public static final String var_authRoleAdmin = "var_authRoleAdmin";
+	public static final String var_authRoleSuperAdmin = "var_authRoleSuperAdmin";
 	public static final String var_AUTH_ROLE_ADMIN = "var_AUTH_ROLE_ADMIN";
 	public static final String var_AUTH_ROLE_LIRE_REQUIS = "var_AUTH_ROLE_LIRE_REQUIS";
 	public static final String var_AUTH_ROLE_REQUIS = "var_AUTH_ROLE_REQUIS";

src/main/java/org/computate/frFR/java/ConfigSite.java

@@ -570,7 +570,7 @@ protected void _authRolesAdmin() throws Exception {
 	/**
 	 **/
 	protected void _authPolitiqueGranulee() throws Exception {
-		authPolitiqueGranulee = config.getBoolean(langueConfigGlobale.getString(ConfigCles.var_AUTH_POLITIQUE_GRANULEE), true);
+		authPolitiqueGranulee = config.getBoolean(langueConfigGlobale.getString(ConfigCles.var_AUTH_POLITIQUE_GRANULEE), false);
 	}
 
 	/**

src/main/java/org/computate/frFR/java/EcrirePageClasse.java

@@ -3494,7 +3494,7 @@ else if(classeApiMethodeMethode.contains("PATCH") || classeApiMethodeMethode.con
 			tl(1, "{{/inline}}");
 			s(wGetters);
 			tl(0, "{{#*inline \"htm", langueConfig.getString(ConfigCles.var_Formulaires), classePageNomSimple, "\"}}");
-			tl(1, "{{#ifContainsAnyRoles roles ", langueConfig.getString(ConfigCles.var_roleRequis), "}}");
+			tl(0, "{{#ifContainsAnyRoles roles ", langueConfig.getString(ConfigCles.var_authRoleSuperAdmin), "}}");
 
 			// refraîchir 1 //
 			tl(2, "{{#eq ", uncapitalizeClasseApiClasseNomSimple, "Count int1}}");
@@ -3507,26 +3507,30 @@ else if(classeApiMethodeMethode.contains("PATCH") || classeApiMethodeMethode.con
 			tl(2, "</button>");
 			tl(2, "{{/eq}}");
 
-			tl(1, "{{/ifContainsAnyRoles}}");
+			tl(0, "{{/ifContainsAnyRoles}}");
 
 			// formulaires //
-			if(activerRoleAdmin) {
-				tl(1, "{{#ifContainsAnyRoles roles ", langueConfig.getString(ConfigCles.var_authRoleAdmin), "}}");
-			}
 			for(String classeApiMethode : classeApiMethodes) {
 				String classeApiOperationIdMethode = classeDoc.getString("classeApiOperationId" + classeApiMethode + "_" + langueNom + "_stored_string");
 				String classeApiUriMethode = classeDoc.getString("classeApiUri" + classeApiMethode + "_" + langueNom + "_stored_string");
 				String classeApiTypeMediaMethode = classeDoc.getString("classeApiTypeMedia200" + classeApiMethode + "_" + langueNom + "_stored_string");
 				String classeApiMethodeMethode = classeDoc.getString("classeApiMethode" + classeApiMethode + "_" + langueNom + "_stored_string");
 
-				if(classeApiMethode.equals("PATCH") || classeApiMethode.equals("POST") || classeApiMethode.equals(langueConfig.getString(ConfigCles.var_PUTCopie)) || classeApiMethode.equals(langueConfig.getString(ConfigCles.var_PUTFusion)) || classeApiMethode.equals("PUTImport")) {
+				if(classeApiMethode.equals("POST")) {
+					if(activerRoleAdmin) {
+						tl(0, "{{#ifContainsAnyRoles roles ", langueConfig.getString(ConfigCles.var_authRoleAdmin), "}}");
+					}
 					l("{{#block \"htm", langueConfig.getString(ConfigCles.var_Formulaire), "_", classeApiOperationIdMethode, "\"}}{{/block}}");
+					if(activerRoleAdmin) {
+						tl(0, "{{/ifContainsAnyRoles}}");
+					}
+				} else if(classeApiMethode.equals("PATCH") || classeApiMethode.equals(langueConfig.getString(ConfigCles.var_PUTCopie)) || classeApiMethode.equals(langueConfig.getString(ConfigCles.var_PUTFusion)) || classeApiMethode.equals("PUTImport")) {
+					tl(0, "{{#ifContainsAnyRoles roles ", langueConfig.getString(ConfigCles.var_authRoleSuperAdmin), "}}");
+					l("{{#block \"htm", langueConfig.getString(ConfigCles.var_Formulaire), "_", classeApiOperationIdMethode, "\"}}{{/block}}");
+					tl(0, "{{/ifContainsAnyRoles}}");
 				}
 			}
 
-			if(activerRoleAdmin) {
-				tl(1, "{{/ifContainsAnyRoles}}");
-			}
 			l("{{#block \"htm", langueConfig.getString(ConfigCles.var_Suggere), "\"}}{{/block}}");
 			tl(0, "{{/inline}}");
 

src/main/resources/org/computate/i18n/i18n_enUS.yml

@@ -306,6 +306,7 @@ var_attribuer: "relate"
 var_Attribuer: "Relate"
 var_AucunNomTrouve: "NoNameFound"
 var_authRoleAdmin: "authRoleAdmin"
+var_authRoleSuperAdmin: "authRoleSuperAdmin"
 var_AUTH_ROLE_ADMIN: "AUTH_ROLE_ADMIN"
 var_AUTH_ROLE_LIRE_REQUIS: "AUTH_ROLE_READ_REQUIRED"
 var_AUTH_ROLE_REQUIS: "AUTH_ROLE_REQUIRED"

src/main/resources/org/computate/i18n/i18n_frFR.yml

@@ -71,6 +71,7 @@ var_attribuer: "attribuer"
 var_Attribuer: "Attribuer"
 var_AucunNomTrouve: "AucunNomTrouve"
 var_authRoleAdmin: "authRoleAdmin"
+var_authRoleSuperAdmin: "authRoleSuperAdmin"
 var_AUTH_ROLE_ADMIN: "AUTH_ROLE_ADMIN"
 var_AUTH_ROLE_LIRE_REQUIS: "AUTH_ROLE_LIRE_REQUIS"
 var_AUTH_ROLE_REQUIS: "AUTH_ROLE_REQUIS"