You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/06/18 01:47:26 UTC

svn commit: r955792 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java

Author: reto
Date: Thu Jun 17 23:47:26 2010
New Revision: 955792

URL: http://svn.apache.org/viewvc?rev=955792&view=rev
Log:
CLEREZZA-172: BaseRoles back to the list of roles

Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java?rev=955792&r1=955791&r2=955792&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java Thu Jun 17 23:47:26 2010
@@ -673,6 +673,7 @@ public class UserManagerWeb implements G
 		GraphNode result =  new GraphNode(roleOverviewPage,
 				new UnionMGraph(resultGraph, systemGraph));
 		addAvailableRoles(result);
+		addBaseRoles(result);
 		return result;
 		
 	}
@@ -944,4 +945,11 @@ public class UserManagerWeb implements G
 			result.addProperty(USERMANAGER.role, roles.next());
 		}
 	}
+
+	private void addBaseRoles(GraphNode result) {
+		Iterator<Triple> baseRoles = systemGraph.filter(null, RDF.type, PERMISSION.BaseRole);
+		if (baseRoles.hasNext()) {
+			result.addProperty(USERMANAGER.role, baseRoles.next().getSubject());
+		}
+	}
 }