You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/11/19 15:57:41 UTC

svn commit: r476834 - in /lenya/trunk/src: modules-core/administration/config/cocoon-xconf/ modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ modules-core/administration/usecases/ pubs/blog/config/ac/

Author: andreas
Date: Sun Nov 19 06:57:40 2006
New Revision: 476834

URL: http://svn.apache.org/viewvc?view=rev&rev=476834
Log:
Exit admin.usecases to same usecase, fixed checkbox parameter handling

Modified:
    lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-usecases.xconf
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Usecases.java
    lenya/trunk/src/modules-core/administration/usecases/usecases.jx
    lenya/trunk/src/pubs/blog/config/ac/usecase-policies.xml

Modified: lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-usecases.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-usecases.xconf?view=diff&rev=476834&r1=476833&r2=476834
==============================================================================
--- lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-usecases.xconf (original)
+++ lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-usecases.xconf Sun Nov 19 06:57:40 2006
@@ -26,7 +26,8 @@
     <component-instance name="admin.usecases" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.Usecases">
       <view template="modules/administration/usecases/usecases.jx" menu="true">
         <tab group="admin" name="usecases"/>
-      </view>
+      </view>
+      <exit usecase="admin.usecases"/>
     </component-instance>
     
   </xconf>

Modified: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Usecases.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Usecases.java?view=diff&rev=476834&r1=476833&r2=476834
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Usecases.java (original)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Usecases.java Sun Nov 19 06:57:40 2006
@@ -98,7 +98,8 @@
         for (int u = 0; u < usecases.length; u++) {
             for (int r = 0; r < roleNames.length; r++) {
                 String key = usecases[u] + ":" + roleNames[r];
-                boolean value = getParameterAsBoolean(key, false);
+                String stringValue = getBooleanCheckboxParameter(key);
+                boolean value = Boolean.valueOf(stringValue).booleanValue();
                 Role role = getAccessController().getAccreditableManager().getRoleManager()
                         .getRole(roleNames[r]);
                 getUsecaseAuthorizer().setPermission(usecases[u], pub, role, value);

Modified: lenya/trunk/src/modules-core/administration/usecases/usecases.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/usecases.jx?view=diff&rev=476834&r1=476833&r2=476834
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/usecases.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/usecases.jx Sun Nov 19 06:57:40 2006
@@ -40,7 +40,7 @@
           <p><strong>Note:</strong><br/>
             If you submit this form, all usecase permissions
             are stored for the publication "<jx:out value="${usecase.getParameter('publicationId')}"/>".
-            If you want to set the inherited usecase permissions of a template publication, please go
+            If you want to change the inherited usecase permissions of a template publication, please go
             to the administration GUI of one of the templates
             (<jx:forEach var="template" items="${usecase.getParameter('templates')}">
               <a href="${request.contextPath + '/' + template + '/authoring/index.html?lenya.usecase=admin.usecases'}"><jx:out value="${template}"/></a>

Modified: lenya/trunk/src/pubs/blog/config/ac/usecase-policies.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/blog/config/ac/usecase-policies.xml?view=diff&rev=476834&r1=476833&r2=476834
==============================================================================
--- lenya/trunk/src/pubs/blog/config/ac/usecase-policies.xml (original)
+++ lenya/trunk/src/pubs/blog/config/ac/usecase-policies.xml Sun Nov 19 06:57:40 2006
@@ -25,4 +25,5 @@
   <usecase id="workflow.publish"><role id="edit" method="grant"/></usecase>
   <usecase id="ac.logout"><role id="edit" method="grant"/></usecase>
   <usecase id="admin.users"><role id="edit" method="grant"/></usecase>
+  <usecase id="admin.secases"><role id="edit" method="grant"/></usecase>
 </usecases>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org