Author: coheigea
Date: Wed Jan 30 11:47:01 2013
New Revision: 1440355

URL: http://svn.apache.org/viewvc?rev=1440355&view=rev
Log:
[SYNCOPE-299] - Backmerged.

Modified:
    syncope/branches/1_0_X/   (props changed)
    
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/commons/XMLRolesReader.java
    
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java

Propchange: syncope/branches/1_0_X/
------------------------------------------------------------------------------
  Merged /syncope/trunk:r1440353

Modified: 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/commons/XMLRolesReader.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/commons/XMLRolesReader.java?rev=1440355&r1=1440354&r2=1440355&view=diff
==============================================================================
--- 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/commons/XMLRolesReader.java
 (original)
+++ 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/commons/XMLRolesReader.java
 Wed Jan 30 11:47:01 2013
@@ -60,7 +60,7 @@ public class XMLRolesReader {
     }
 
     /**
-     * Get all roles allowed for specific page and actio requested.
+     * Get all roles allowed for specific page and action requested.
      *
      * @param pageId
      * @param actionId

Modified: 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1440355&r1=1440354&r2=1440355&view=diff
==============================================================================
--- 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
 (original)
+++ 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
 Wed Jan 30 11:47:01 2013
@@ -236,9 +236,6 @@ public class Resources extends BasePage 
 
         final Form paginatorForm = new Form("resourcePaginatorForm");
 
-        MetaDataRoleAuthorizationStrategy.authorize(paginatorForm, RENDER, 
xmlRolesReader.getAllAllowedRoles(
-                "Resources", "list"));
-
         final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", 
new PropertyModel(this,
                 "resourcePaginatorRows"), prefMan.getPaginatorChoices());
 


Reply via email to