Author: ito
Date: Mon Jul 5 12:38:11 2010
New Revision: 960583
URL: http://svn.apache.org/viewvc?rev=960583&view=rev
Log:
manually added permissions are displayed and BasePermissionRole is editable
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml?rev=960583&r1=960582&r2=960583&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml
Mon Jul 5 12:38:11 2010
@@ -54,18 +54,7 @@ resultDocModifier.addNodes2Elem("tx-cont
<tr
id={role/dc("title")*}>
<td>
{
-
var isBaseRole:Boolean = false
-
for (rdfType <- (role/rdf("type"))) yield {
-
if (rdfType.getNode.equals(permission("BaseRole"))) {
-
isBaseRole = true;
-
} else {}
-
}
-
if (!isBaseRole) {
-
<input type="checkbox" value={role/dc("title")*}/>
-
} else {
-
<input type="checkbox" disabled="disabled"
value={role/dc("title")*}/>
-
}
-
+
<input type="checkbox" value={role/dc("title")*}/>
}
</td>
<td>{role/dc("title")*}</td>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml?rev=960583&r1=960582&r2=960583&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml
Mon Jul 5 12:38:11 2010
@@ -16,7 +16,7 @@ resultDocModifier.addNodes2Elem("tx-modu
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a
id="editButton" class="tx-button tx-button-generic" href="list-roles">Back to
Overview</a></li>);
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a
id="saveButton" class="tx-button tx-button-create tx-inactive" href="#">Save
Permissions</a></li>);
-var allRolePermissions = "Permissions:";
+var allRolePermissions = "";
for (perm <- (res/umr("role")/permission("hasPermission"))) {
allRolePermissions = allRolePermissions + "," +
(perm/permission("javaPermissionEntry")*)
}
@@ -39,11 +39,11 @@ for (perm <- (res/umr("role")/permission
</thead>
<tbody>
{for (perm <- (res/umr("permission"))) yield {
+ val javaPermission =
(perm/permission("javaPermissionEntry")*);
<tr>
- <td>{
- val javaPermission =
(perm/permission("javaPermissionEntry")*);
-
+ <td>{
if(allRolePermissions.contains(javaPermission)) {
+ allRolePermissions =
allRolePermissions.replace("," + javaPermission, "")
<input type="checkbox"
checked="checked" name="permEntries" value={javaPermission} />
} else {
<input type="checkbox"
name="permEntries" value={javaPermission} />
@@ -54,10 +54,23 @@ for (perm <- (res/umr("role")/permission
<td><span style="line-height:
1.5em;">{perm/dct("title")*}</span></td>
<td><span style="line-height:
1.5em;">{perm/dct("description")*}</span></td>
- <td><span style="line-height:
1.5em;">{perm/permission("javaPermissionEntry")*}</span></td>
+ <td><span style="line-height:
1.5em;">{javaPermission}</span></td>
</tr>
}
}
+ {
+ val otherRolePermissions =
allRolePermissions.split(",")
+ for(perm <- otherRolePermissions) yield {
+ ifx(!perm.equals("")) {
+ <tr>
+ <td><input type="checkbox"
checked="checked" name="permEntries" value={perm} /></td>
+ <td><span style="line-height:
1.5em;"></span></td>
+ <td><span style="line-height:
1.5em;"></span></td>
+ <td><span style="line-height:
1.5em;">{perm}</span></td>
+ </tr>
+ }
+ }
+ }
</tbody>
</table>
</form>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js?rev=960583&r1=960582&r2=960583&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js
Mon Jul 5 12:38:11 2010
@@ -12,14 +12,18 @@ RoleManager.initButtons = function() {
var counter = 1;
activatedCheckBoxes.each(function() {
var title = $(this).val();
- var options = new AjaxOptions("delete-role-" +
counter, "deleting role ", function(data) {
- $("#" + title).remove();
- });
- options.type = "POST";
- options.url = "./delete-role";
- options.data = {"roleTitle": title};
- $.ajax(options);
- counter++;
+ if(title != "BasePermissionsRole") {
+ var options = new
AjaxOptions("delete-role-" + counter, "deleting role ", function(data) {
+ $("#" + title).remove();
+ });
+ options.type = "POST";
+ options.url = "./delete-role";
+ options.data = {"roleTitle": title};
+ $.ajax(options);
+ counter++;
+ } else {
+ AlertMessage.show(undefined, "Could not
delete BasePermissionsRole", "Alert", "Ok");
+ }
});
}
});
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml?rev=960583&r1=960582&r2=960583&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml
Mon Jul 5 12:38:11 2010
@@ -17,14 +17,16 @@ resultDocModifier.addNodes2Elem("tx-modu
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a
id="backButton" class="tx-button tx-button-generic" href="list-users">Back to
Overview</a></li>);
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a
id="saveButton" class="tx-button tx-button-create tx-inactive" href="#">Save
Permissions</a></li>);
-var allUserPermissions = "Permissions:";
+var allUserPermissions = "";
for (perm <- (res/umr("user")/permission("hasPermission"))) {
allUserPermissions = allUserPermissions + "," +
(perm/permission("javaPermissionEntry")*)
}
-var rolePermissions = "Permissions:";
+var rolePermissions = "";
for (role <- (res/umr("user")/sioc("has_function"))) {
- rolePermissions = rolePermissions + "," +
(role/permission("hasPermission")/permission("javaPermissionEntry")*);
+ for (rolePerm <- (role/permission("hasPermission"))) {
+ rolePermissions = rolePermissions + "," +
(rolePerm/permission("javaPermissionEntry")*);
+ }
}
<div id="tx-content">
@@ -46,13 +48,15 @@ for (role <- (res/umr("user")/sioc("has_
</thead>
<tbody>
{for (perm <- (res/umr("permission"))) yield {
+ val javaPermission =
(perm/permission("javaPermissionEntry")*);
<tr>
- <td>{
- val javaPermission =
(perm/permission("javaPermissionEntry")*);
+ <td>{
if(rolePermissions.contains(javaPermission)) {
+ rolePermissions =
rolePermissions.replace("," + javaPermission, "")
<input type="checkbox"
checked="checked" disabled="disabled" value={javaPermission} />
} else {
if(allUserPermissions.contains(javaPermission)) {
+
allUserPermissions = allUserPermissions.replace("," + javaPermission, "")
<input
type="checkbox" checked="checked" name="permEntries" value={javaPermission} />
} else {
<input
type="checkbox" name="permEntries" value={javaPermission} />
@@ -63,10 +67,36 @@ for (role <- (res/umr("user")/sioc("has_
<td><span style="line-height:
1.5em;">{perm/dct("title")*}</span></td>
<td><span style="line-height:
1.5em;">{perm/dct("description")*}</span></td>
- <td><span style="line-height:
1.5em;">{perm/permission("javaPermissionEntry")*}</span></td>
+ <td><span style="line-height:
1.5em;">{javaPermission}</span></td>
</tr>
}
}
+ {
+ val otherUserPermissions =
allUserPermissions.split(",")
+ for(perm <- otherUserPermissions) yield {
+ ifx(!perm.equals("")) {
+ <tr>
+ <td><input type="checkbox"
checked="checked" name="permEntries" value={perm} /></td>
+ <td><span style="line-height:
1.5em;"></span></td>
+ <td><span style="line-height:
1.5em;"></span></td>
+ <td><span style="line-height:
1.5em;">{perm}</span></td>
+ </tr>
+ }
+ }
+ }
+ {
+ val otherRolePermissions =
rolePermissions.split(",")
+ for(perm <- otherRolePermissions) yield {
+ ifx(!perm.equals("")) {
+ <tr>
+ <td><input type="checkbox"
checked="checked" disabled="disabled" name="permEntries" value={perm} /></td>
+ <td><span style="line-height:
1.5em;"></span></td>
+ <td><span style="line-height:
1.5em;"></span></td>
+ <td><span style="line-height:
1.5em;">{perm}</span></td>
+ </tr>
+ }
+ }
+ }
</tbody>
</table>
</form>
