You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2013/04/11 19:22:36 UTC
svn commit: r1466984 - in
/stanbol/trunk/commons/security/usermanagement/src/main:
java/org/apache/stanbol/commons/usermanagement/resource/
resources/META-INF/resources/static/user-management/styles/
resources/templates/html/org/apache/stanbol/commons/...
Author: reto
Date: Thu Apr 11 17:22:36 2013
New Revision: 1466984
URL: http://svn.apache.org/r1466984
Log:
STANBOL-897: fixed user edit dialog for existing permissions to show up. Removed some ajax nonsense.
Removed:
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/rolePermissionsCheckboxes.ftl
Modified:
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
stanbol/trunk/commons/security/usermanagement/src/main/resources/META-INF/resources/static/user-management/styles/webconsole.css
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editRole.ftl
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editUser.ftl
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/permissionsCheckboxes.ftl
stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/webConsole.ftl
Modified: stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java?rev=1466984&r1=1466983&r2=1466984&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java (original)
+++ stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java Thu Apr 11 17:22:36 2013
@@ -162,25 +162,12 @@ public class UserResource {
*/
@GET
@Path("users/edit/{username}")
- @Produces(MediaType.TEXT_HTML)
public RdfViewable editUser(@PathParam("username") String userName) {
return new RdfViewable("editUser", getUser(userName),
this.getClass());
}
- /**
- * Produces suitable permission-checkboxes
- */
- @GET
- @Path("users/{username}/permissionsCheckboxes")
- @Produces(MediaType.TEXT_HTML)
- public RdfViewable permissionsCheckboxes(@PathParam("username") String userName) {
- addClassToPermissions(); // workaround
- // showSystem();
- addClassToPermissions(); // workaround
- showSystem();
- return new RdfViewable("permissionsCheckboxes", getPermissionType(), this.getClass());
- }
+
/**
* RESTful access to user roles (and nested permissions right now - may
@@ -619,17 +606,7 @@ public class UserResource {
systemGraph);
}
- /**
- * Produces suitable permission-checkboxes
- */
- @GET
- @Path("roles/{rolename}/permissionsCheckboxes")
- @Produces(MediaType.TEXT_HTML)
- public RdfViewable rolePermissionsCheckboxes(@PathParam("rolename") String roleName) {
- // addClassToPermissions(); // workaround
- // showSystem();
- return new RdfViewable("rolePermissionsCheckboxes", getRole(roleName), this.getClass());
- } // getPermissionType()
+
// **********************************
// ****** ADD ROLE ******************
Modified: stanbol/trunk/commons/security/usermanagement/src/main/resources/META-INF/resources/static/user-management/styles/webconsole.css
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/META-INF/resources/static/user-management/styles/webconsole.css?rev=1466984&r1=1466983&r2=1466984&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/src/main/resources/META-INF/resources/static/user-management/styles/webconsole.css (original)
+++ stanbol/trunk/commons/security/usermanagement/src/main/resources/META-INF/resources/static/user-management/styles/webconsole.css Thu Apr 11 17:22:36 2013
@@ -43,7 +43,7 @@ legend {
font-weight:bold;
}
-.permission input
+.inputPermission
{
width: 30em;
}
Modified: stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editRole.ftl
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editRole.ftl?rev=1466984&r1=1466983&r2=1466984&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editRole.ftl (original)
+++ stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editRole.ftl Thu Apr 11 17:22:36 2013
@@ -40,7 +40,9 @@ limitations under the License.
<fieldset class="labelCheckbox">
<legend>Permissions</legend>
- <div id="role-permissions-checkboxes"></div>
+ <div id="role-permissions-checkboxes">
+ <#include "permissionsCheckboxes.ftl">
+ </div>
</fieldset>
<fieldset>
Modified: stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editUser.ftl
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editUser.ftl?rev=1466984&r1=1466983&r2=1466984&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editUser.ftl (original)
+++ stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/editUser.ftl Thu Apr 11 17:22:36 2013
@@ -54,8 +54,10 @@ limitations under the License.
</fieldset>
<fieldset class="labelCheckbox">
- <legend>Permissions</legend>
- <div id="permissions-checkboxes"></div>
+ <legend>Permissions!</legend>
+ <div id="permissions-checkboxes">
+ <#include "permissionsCheckboxes.ftl">
+ </div>
</fieldset>
<fieldset>
Modified: stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/permissionsCheckboxes.ftl
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/permissionsCheckboxes.ftl?rev=1466984&r1=1466983&r2=1466984&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/permissionsCheckboxes.ftl (original)
+++ stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/resource/permissionsCheckboxes.ftl Thu Apr 11 17:22:36 2013
@@ -6,13 +6,13 @@
<!-- @ldpath path="fn:sort(^rdf:type)" -->
<@ldpath path="fn:sort(permission:hasPermission)">
-<#assign permission>
-<@ldpath path="permission:javaPermissionEntry :: xsd:string"/>
-</#assign>
-
- <input class="checkboxPermission" type="checkbox" id="${permission}" name="${permission}" value="${permission}" checked="checked" />
- <label for="${permission}">${permission}</label>
- <br/>
+ <#assign permission>
+ <@ldpath path="permission:javaPermissionEntry :: xsd:string"/>
+ </#assign>
+ <div class="role">
+ <input class="checkboxPermission" type="checkbox" id="${permission}" name="${permission}" value="${permission}" checked="checked" />
+ <label for="${permission}">${permission}</label>
+ </div>
</...@ldpath>
Modified: stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/webConsole.ftl
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/webConsole.ftl?rev=1466984&r1=1466983&r2=1466984&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/webConsole.ftl (original)
+++ stanbol/trunk/commons/security/usermanagement/src/main/resources/templates/html/org/apache/stanbol/commons/usermanagement/webConsole.ftl Thu Apr 11 17:22:36 2013
@@ -330,13 +330,6 @@ limitations under the License.
$("#roles-checkboxes").html(data);
}, "text/html");
-
- $.get("/user-management/users/"+userName+"/permissionsCheckboxes",
- function(data){
- console.log("permissionsCheckboxes = "+data);
- $("#permissions-checkboxes").html(data);
- }, "text/html");
-
$("#editUserForm").dialog("open");
}
});
@@ -380,12 +373,6 @@ limitations under the License.
dataType: "html",
success: function(data) {
$("#editRoleForm").html(data);
-
- $.get("/user-management/roles/"+roleName+"/permissionsCheckboxes",
- function(data){
- console.log("permissionsCheckboxes = "+data);
- $("#role-permissions-checkboxes").html(data);
- }, "text/html");
$("#editRoleForm").dialog("open");
}