SuperAdmin Functionalities for Multitenancy part 1

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_4.x/Server/trunk@21512 99afaf0d-6903-0410-885a-c66a8bbb5f81
openpam · Dec 6, 2013 · c320931 · c320931
1 parent c803919
commit c320931
Show file tree

Hide file tree

Showing 8 changed files with 197 additions and 111 deletions.
diff --git a/SpagoBIUtils/src/it/eng/spagobi/commons/bo/Role.java b/SpagoBIUtils/src/it/eng/spagobi/commons/bo/Role.java
@@ -6,6 +6,7 @@
 package it.eng.spagobi.commons.bo;
 
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
@@ -47,7 +48,7 @@ public class Role  implements Serializable  {
 
 	private boolean defaultRole;
 
-//	private List<RoleMetaModelCategory> roleMetaModelCategories;
+	private List<RoleMetaModelCategory> roleMetaModelCategories;
 
 	/**
 	 * Checks if is able to save subobjects.
@@ -501,5 +502,20 @@ public String getOrganization() {
 	public void setOrganization(String organization) {
 		this.organization = organization;
 	}
+
+	/**
+	 * @return the roleMetaModelCategories
+	 */
+	public List<RoleMetaModelCategory> getRoleMetaModelCategories() {
+		return roleMetaModelCategories;
+	}
+
+	/**
+	 * @param roleMetaModelCategories the roleMetaModelCategories to set
+	 */
+	public void setRoleMetaModelCategories(
+			List<RoleMetaModelCategory> roleMetaModelCategories) {
+		this.roleMetaModelCategories = roleMetaModelCategories;
+	}
 
 }
diff --git a/SpagoBIUtils/src/it/eng/spagobi/commons/bo/UserProfile.java b/SpagoBIUtils/src/it/eng/spagobi/commons/bo/UserProfile.java
@@ -45,6 +45,9 @@ public class UserProfile implements IEngUserProfile {
 	private Collection functionalities = null;
 	private String defaultRole = null;
 	private String organization = null;
+	private Boolean isSuperadmin = null;
+
+
 	private SpagoBIUserProfile spagoBIUserProfile = null;
 
 	/**
@@ -59,6 +62,7 @@ public UserProfile(SpagoBIUserProfile profile) {
 		this.userName = profile.getUserName();
 		this.userId = profile.getUserId();
 		this.organization = profile.getOrganization();
+		this.isSuperadmin = profile.getIsSuperadmin();
 		roles = new ArrayList();
 		if (profile.getRoles() != null) {
 			int l = profile.getRoles().length;
@@ -102,7 +106,7 @@ public UserProfile(String userUniqueIdentifier, String userId, String userName,
 		this.userName = userName;
 		this.organization = organization;
 	}
-	
+
 	public UserProfile(String userId, String organization) {
 		this.userUniqueIdentifier = userId;
 		this.userId = userId;
@@ -402,7 +406,14 @@ public SpagoBIUserProfile getSpagoBIUserProfile() {
 	public void setSpagoBIUserProfile(SpagoBIUserProfile spagoBIUserProfile) {
 		this.spagoBIUserProfile = spagoBIUserProfile;
 	}
+
+	public Boolean getIsSuperadmin() {
+		return isSuperadmin;
+	}
 
+	public void setIsSuperadmin(Boolean isSuperadmin) {
+		this.isSuperadmin = isSuperadmin;
+	}
 	/**
 	 * To be user by external engines ONLY.
 	 * The user identifier must match this syntax:

diff --git a/SpagoBIUtils/src/it/eng/spagobi/commons/constants/SpagoBIConstants.java b/SpagoBIUtils/src/it/eng/spagobi/commons/constants/SpagoBIConstants.java
@@ -314,7 +314,10 @@ public class SpagoBIConstants {
 	public static final String SUBOBJECT = "SUBOBJECT";
 
 	//constants for user profiles
+	//---superadmin functionalities
+	public static final String TENANT_MANAGEMENT = "TenantManagement";
 	public static final String ENGINES_MANAGEMENT = "EnginesManagement";
+	//---end
 	public static final String DATASET_MANAGEMENT = "DatasetManagement";
 	public static final String FUNCTIONALITIES_MANAGEMENT = "FunctionalitiesManagement";
 	public static final String LOVS_MANAGEMENT = "LovsManagement";
@@ -374,6 +377,9 @@ public class SpagoBIConstants {
 	public static final String SEE_TODO_LIST = "SeeToDoList";
 	public static final String CREATE_DOCUMENT = "CreateDocument";
 
+
+
+
 	public static final String DOCUMENT_MOVE_DOWN_STATE = "DocumentMoveDownState" ;
 	public static final String DOCUMENT_MOVE_UP_STATE = "DocumentMoveUpState" ;
 	//for management of DOCUMENT COMPOSITION