equanda-svn-commit Mailing List for equanda Java EE code generator (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1159
          http://equanda.svn.sourceforge.net/equanda/?rev=1159&view=rev
Author:   triathlon98
Date:     2009-09-22 15:30:16 +0000 (Tue, 22 Sep 2009)

Log Message:
-----------
EQ-347 set initial statusses, EQ-349 indicate role, EQ-361 allow (un)select all actions/selects

Modified Paths:
--------------
    branches/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
    branches/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt
    branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/AuthAndConfigGroup.tml.vm
    branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
    branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
    branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
    branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
    branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
    branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
    branches/0.9.4.1/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js

Modified: branches/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
===================================================================

--- branches/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java	2009-09-22 10:04:00 UTC (rev 1158)
+++ branches/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java	2009-09-22 15:30:16 UTC (rev 1159)
@@ -36,7 +36,7 @@
      * 
      * @param isGuiAdmin The value to set the GUI Admin flag to
      */
-    void setIsGuiAdmin( boolean isGuiAdmin );
+    void setGuiAdmin( boolean isGuiAdmin );
     
     /**
      * Set the role being used

Modified: branches/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt
===================================================================
--- branches/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt	2009-09-22 10:04:00 UTC (rev 1158)
+++ branches/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt	2009-09-22 15:30:16 UTC (rev 1159)
@@ -515,6 +515,9 @@
 .label.en Configure
 .key authAndConfig.label.Enable/equanda-fixed
 .label.en Enable
+.key authAndConfig.label.Role/equanda-fixed
+.label.en Role :_
+.label.nl Rol :_
 .key authAndConfig.select.Role/equanda-fixed
 .label.en Choose the role you wish to edit, or leave blank to edit the current user.
 .key authAndConfig.select.Prohibited/equanda-fixed

Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/AuthAndConfigGroup.tml.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/AuthAndConfigGroup.tml.vm	2009-09-22 10:04:00 UTC (rev 1158)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/AuthAndConfigGroup.tml.vm	2009-09-22 15:30:16 UTC (rev 1159)
@@ -10,11 +10,11 @@
     
     $!{group.Name} |
 
-#set ($readBox="${group.Name}_groupReadCheck")
-#set ($writeBox="${group.Name}_groupWriteCheck")
-#set ($listBox="${group.Name}_groupListCheck")
-#set ($sumBox="${group.Name}_groupSumCheck")
-#set ($printBox="${group.Name}_groupPrintCheck")
+#set( $readBox = "${group.Name}_groupReadCheck" )
+#set( $writeBox = "${group.Name}_groupWriteCheck" )
+#set( $listBox = "${group.Name}_groupListCheck" )
+#set( $sumBox = "${group.Name}_groupSumCheck" )
+#set( $printBox = "${group.Name}_groupPrintCheck" )
 
     <input t:id="${readBox}" name="${readBox}" value="${readBox}" 
         onclick="eqHandlePageBox( ${readBox}, '$!{group.Name}', '_readCheck', '${writeBox}', ${listBox}, ${sumBox}, ${printBox} )"
@@ -63,12 +63,12 @@
     </div>
     <br/>
     
-#foreach( $field in $group.Fields)
-#set ($readBox="${field.Name}_readCheck")
-#set ($writeBox="${field.Name}_writeCheck")
-#set ($listBox="${field.Name}_listCheck")
-#set ($summaryBox="${field.Name}_sumCheck")
-#set ($printBox="${field.Name}_printCheck")
+#foreach( $field in $group.Fields )
+#set( $readBox = "${field.Name}_readCheck" )
+#set( $writeBox = "${field.Name}_writeCheck" )
+#set( $listBox = "${field.Name}_listCheck" )
+#set( $summaryBox = "${field.Name}_sumCheck" )
+#set( $printBox = "${field.Name}_printCheck" )
 
 ## if the field is a link it should only be displayed if the target table is visible
 #if( ${field.isLink()} )

Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm	2009-09-22 10:04:00 UTC (rev 1158)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm	2009-09-22 15:30:16 UTC (rev 1159)
@@ -45,6 +45,7 @@
 import org.apache.tapestry5.*;
 import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
 import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
 import org.apache.tapestry5.ioc.annotations.Inject;
 import org.apache.tapestry5.services.ComponentSource;
 import org.apache.tapestry5.runtime.Component;
@@ -77,60 +78,57 @@
     private NavigationManager navigationManager;    
     
     @Persist
-    private String roleName;
-    public String getRoleName()
+    private boolean guiAdmin;
+    public void setGuiAdmin( boolean guiAdmin )
     {
-        return roleName;
+        this.guiAdmin = guiAdmin;
     }
+    public boolean isGuiAdmin()
+    {
+        return guiAdmin;
+    }
+
+    @Persist
+    private String roleName;
     public void setRoleName( String roleName )
     {
         this.roleName = roleName;
-    } 
-   
-    @Persist
-    private boolean isGuiAdmin;
-    public boolean getIsGuiAdmin()
+    }
+    public String getRoleName()
     {
-        return isGuiAdmin;
-    }   
-    public void setIsGuiAdmin( boolean isGuiAdmin )
-    {
-        this.isGuiAdmin = isGuiAdmin;
+        return roleName;
     }
-    
+
     private boolean writeAllowed;
     public boolean getWriteAllowed()
     {
-        return getIsGuiAdmin() && (getRoleName() != null);
+        return guiAdmin && (getRoleName() != null);
     }
 
     private Object nextPage;
     
-    public void initPage( String roleName, boolean isGuiAdmin )
+    public void initPage( String roleName, boolean guiAdmin )
     {
         setRoleName( roleName );
-        setIsGuiAdmin( isGuiAdmin );
+        this.guiAdmin = guiAdmin;
     }
 #foreach( $table in $dm.RootTables )
 #set ($readBox="${table.Name}_readCheck")
 #set ($writeBox="${table.Name}_writeCheck")
 #set ($deleteBox="${table.Name}_deleteCheck")
-    @Persist	
+    @Persist
+    @Property
     private boolean $readBox;
     @Persist
+    @Property
     private boolean $writeBox;
     @Persist
+    @Property
     private boolean $deleteBox;
-    public boolean get$readBox(){ return $readBox; }
-    public void set$readBox( boolean val ){ this.$readBox = val; }
-    public boolean get$writeBox(){ return $writeBox; }
-    public void set$writeBox( boolean val ){ this.$writeBox = val; }
-    public boolean get$deleteBox(){ return $deleteBox; }
-    public void set$deleteBox( boolean val ){ this.$deleteBox = val; }
     public Object[] getcontext_${table.Name}()
     {
         // Context values may not be null or blank.
-        return new Object[] { "${table.Name}", getRoleName() != null ? getRoleName() : noRoleIndicator, getIsGuiAdmin() ? "on" : "off"};
+        return new Object[] { "${table.Name}", getRoleName() != null ? getRoleName() : noRoleIndicator, guiAdmin ? "on" : "off"};
     }
     
 #end
@@ -140,7 +138,7 @@
      * @param readBox A boolean value indicating whether to set this key readable
      * @param writeBox A boolean value indicating whether to set this key writable
      * @param deleteBox A boolean value indicating whether to set this key to enable delete
-     * @throws EquandaException
+     * @throws EquandaException persistence problems
      */
     private void setAuths( String tableName, boolean readBox, boolean writeBox, boolean deleteBox ) throws EquandaException
     {
@@ -160,7 +158,7 @@
             aacProvider.setDelete(key);
         }
         
-        if( readBox == false && writeBox == false && deleteBox == false )
+        if( !readBox && !writeBox && !deleteBox )
         {
             aacProvider.setHidden(key);
         }
@@ -228,7 +226,7 @@
 
         if( this.roleName != null )
         {
-            EquandaRole thisRole = EquandaRole.selectRole(this.roleName);
+            EquandaRole thisRole = EquandaRole.selectRole( this.roleName );
             thisRole.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
             thisRole.equandaUpdate();
         }
@@ -251,9 +249,9 @@
 #set ($readBox="${table.Name}_readCheck")
 #set ($writeBox="${table.Name}_writeCheck")
 #set ($deleteBox="${table.Name}_deleteCheck")
-        set${readBox}( aacProvider.isReadable( "table.${table.Name}") );
-        set${writeBox}( aacProvider.isWritable( "table.${table.Name}") );
-        set${deleteBox}( aacProvider.isDeletable( "table.${table.Name}") );
+        ${readBox} = aacProvider.isReadable( "table.${table.Name}");
+        ${writeBox} = aacProvider.isWritable( "table.${table.Name}");
+        ${deleteBox} = aacProvider.isDeletable( "table.${table.Name}");
 #end
     }
 
@@ -281,14 +279,14 @@
         if( context.length == 3 )
         {
             AuthAndConfigPages page = (AuthAndConfigPages)source.getPage( context[0] + "/AuthAndConfig" );
-        
+
             String roleName = (String)context[1];
             String isGuiAdmin = (String)context[2];
 
             try
             {
                 navigationManager.beginNavigation( resources );
-                page.setIsGuiAdmin( isGuiAdmin.equals("off") ? false : true );
+                page.setGuiAdmin( !"off".equals( isGuiAdmin ) );
                 page.setRoleName( roleName.equals(noRoleIndicator) ? null : roleName );
             }
             catch( Exception e )

Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm	2009-09-22 10:04:00 UTC (rev 1158)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm	2009-09-22 15:30:16 UTC (rev 1159)
@@ -11,9 +11,8 @@
        	<input t:type="submit" value="equanda-message:button.Cancel" t:id="cancel"/>
     </t:parameter>
     
-  <br />
-  <br />
-
+    <t:if test="roleName"><p>${dollar}{equanda-message:authAndConfig.label.Role}${dollar}{roleName}</p></t:if>
+      
     <div>
     <div class="t-data-grid">
     <table class="t-data-grid">

Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm	2009-09-22 10:04:00 UTC (rev 1158)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm	2009-09-22 15:30:16 UTC (rev 1159)
@@ -45,6 +45,7 @@
 import org.apache.tapestry5.SelectModel;
 import org.apache.tapestry5.annotations.InjectPage;
 import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
 import org.apache.tapestry5.ioc.annotations.Inject;
 import org.equanda.client.EquandaException;
 import org.equanda.client.LoginInfo;
@@ -74,25 +75,26 @@
 
     private Object nextPage;
         
-    private String roleName;
-    public String getRoleName()
+    @Persist
+    private boolean guiAdmin;
+    public void setGuiAdmin( boolean guiAdmin )
     {
-        return roleName;
+        this.guiAdmin = guiAdmin;
     }
-    public void setRoleName( String roleName )
+    public boolean isGuiAdmin()
     {
-        this.roleName = roleName;
+        return guiAdmin;
     }
-    
+
     @Persist
-    private boolean isGuiAdmin;
-    public boolean getIsGuiAdmin()
+    private String roleName;
+    public void setRoleName( String roleName )
     {
-        return this.isGuiAdmin;
+        this.roleName = roleName;
     }
-    public void setIsGuiAdmin( boolean isGuiAdmin )
+    public String getRoleName()
     {
-        this.isGuiAdmin = isGuiAdmin;
+        return roleName;
     }
 
     public SelectModel getRolesChoiceModel()
@@ -117,7 +119,7 @@
     
     public void onActivate()
     {
-        setIsGuiAdmin(false);
+        guiAdmin = false;
         
         try
         {
@@ -128,7 +130,7 @@
             {   
                 if( thisRole.isGuiAdministrator() == true )
                 {
-                    setIsGuiAdmin(true);
+                    guiAdmin = true;
                     break;
                 }
             }
@@ -142,10 +144,10 @@
     public void onSelectedFromOk()
         throws EquandaException
     {
-        if ( getIsGuiAdmin() )
+        if ( guiAdmin )
         {
             navigationManager.beginNavigation( resources );
-            tablePage.initPage( getRoleName(), getIsGuiAdmin() );
+            tablePage.initPage( getRoleName(), guiAdmin );
             tablePage.refreshBoxes();
             nextPage = tablePage;
         }

Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm	2009-09-22 10:04:00 UTC (rev 1158)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm	2009-09-22 15:30:16 UTC (rev 1159)
@@ -5,7 +5,7 @@
 
     <t:parameter name="title">${dollar}{equanda-message:authAndConfig.title.Roles}</t:parameter>
 
-    <t:if test="isGuiAdmin">
+    <t:if test="isGuiAdmin()">
         <p>${dollar}{equanda-message:authAndConfig.select.Role}</p>
         <br/>
         <select t:type="Select" t:model="RolesChoiceModel" t:value="roleName" t:blankOption="ALWAYS"/>

Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm	2009-09-22 10:04:00 UTC (rev 1158)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm	2009-09-22 15:30:16 UTC (rev 1159)
@@ -43,6 +43,7 @@
 import org.apache.log4j.Logger;
 import org.apache.tapestry5.ioc.annotations.Inject;
 import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
 import org.apache.tapestry5.ValidationTracker;
 import org.apache.tapestry5.ComponentResources;
 import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
@@ -78,22 +79,27 @@
     @Inject
     private NavigationManager navigationManager;
 
-    @InjectPage
-    private AuthAndConfigTables tablesPage;
+    @Persist
+    @Property
+    private boolean selectCheck;
     
+    @Persist
+    @Property
+    private boolean actionCheck;
+
     private Object nextPage;
     
     @Persist
-    private boolean isGuiAdmin;
-    public void setIsGuiAdmin( boolean isGuiAdmin )
+    private boolean guiAdmin;
+    public void setGuiAdmin( boolean guiAdmin )
     {
-        this.isGuiAdmin = isGuiAdmin;
+        this.guiAdmin = guiAdmin;
     }
-    public boolean getIsGuiAdmin()
+    public boolean isGuiAdmin()
     {
-        return isGuiAdmin;
+        return guiAdmin;
     }
-    
+
     @Persist
     private String roleName;
     public void setRoleName( String roleName )
@@ -108,7 +114,7 @@
     private boolean writeAllowed;
     public boolean getWriteAllowed()
     {
-        return getIsGuiAdmin() && (getRoleName() != null);
+        return guiAdmin && (getRoleName() != null);
     }
 
 #foreach( $page in $table.Pages )
@@ -121,29 +127,24 @@
 #set ($sumBox="${page.Name}_pageSumCheck")
 #set ($printBox="${page.Name}_pagePrintCheck")
     @Persist
+    @Property
     private boolean $readBox;
-    public boolean get$readBox(){ return $readBox; }
-    public void set$readBox( boolean val ){ this.$readBox = val; }
 
     @Persist
+    @Property
     private boolean $writeBox;
-    public boolean get$writeBox(){ return $writeBox; }
-    public void set$writeBox( boolean val ){ this.$writeBox = val; }
 
     @Persist
+    @Property
     private boolean $listBox;
-    public boolean get$listBox(){ return $listBox; }
-    public void set$listBox( boolean val ){ this.$listBox = val; }
 
     @Persist
+    @Property
     private boolean $sumBox;
-    public boolean get$sumBox(){ return $sumBox; }
-    public void set$sumBox( boolean val ){ this.$sumBox = val; }
 
     @Persist
+    @Property
     private boolean $printBox;
-    public boolean get$printBox(){ return $printBox; }
-    public void set$printBox( boolean val ){ this.$printBox = val; }
 
 #foreach( $group in $page.Groups)
 
@@ -162,29 +163,24 @@
 #set ($summaryBox="${field.Name}_sumCheck")
 #set ($printBox="${field.Name}_printCheck")
     @Persist
+    @Property
     private boolean $readBox;
-    public boolean get$readBox(){ return $readBox; }
-    public void set$readBox( boolean val ){ this.$readBox = val; }
 
     @Persist
+    @Property
     private boolean $writeBox;
-    public boolean get$writeBox(){ return $writeBox; }
-    public void set$writeBox( boolean val ){ this.$writeBox = val; }
 
     @Persist
+    @Property
     private boolean $listBox;
-    public boolean get$listBox(){ return $listBox; }
-    public void set$listBox( boolean val ){ this.$listBox = val; }
 
     @Persist
+    @Property
     private boolean $summaryBox;
-    public boolean get$summaryBox(){ return $summaryBox; }
-    public void set$summaryBox( boolean val ){ this.$summaryBox = val; }
 
     @Persist
+    @Property
     private boolean $printBox;
-    public boolean get$printBox(){ return $printBox; }
-    public void set$printBox( boolean val ){ this.$printBox = val; }
 
 #end
 
@@ -192,9 +188,8 @@
 #foreach( $select in $table.SelectsNotHidden)
 #set ($selectBox="${select.Name}_selectCheck")
     @Persist
+    @Property
     private boolean $selectBox;
-    public boolean get$selectBox(){ return $selectBox; }
-    public void set$selectBox( boolean val ){ this.$selectBox = val; }
 
 #end
 
@@ -202,9 +197,8 @@
 #foreach( $action in $table.Actions)
 #set ($actionBox="${action.Name}_actionCheck")
     @Persist
+    @Property
     private boolean $actionBox;
-    public boolean get$actionBox(){ return $actionBox; }
-    public void set$actionBox( boolean val ){ this.$actionBox = val; }
 
 #end
     final public void onActivate()
@@ -337,8 +331,8 @@
             aacProvider.setHidden( key );
         }
         
-        if( this.roleName != null ){
-            LoginCache.setRoleAuths( this.roleName, aacProvider ) ;    
+        if( getRoleName() != null ){
+            LoginCache.setRoleAuths( getRoleName(), aacProvider ) ;
         }
         else
         {
@@ -357,26 +351,26 @@
 #set ($listBox="${field.Name}_listCheck")
 #set ($summaryBox="${field.Name}_sumCheck")
 #set ($printBox="${field.Name}_printCheck")
-        set${readBox}( aacProvider.isReadable( "field.${table.Name}.${field.Name}" ) );
-        set${writeBox}( aacProvider.isWritable( "field.${table.Name}.${field.Name}" ) );
-        set${listBox}( aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" ) );
-        set${summaryBox}( aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" ) );
-        set${printBox}( aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" ) );
+        ${readBox} = aacProvider.isReadable( "field.${table.Name}.${field.Name}" );
+        ${writeBox} = aacProvider.isWritable( "field.${table.Name}.${field.Name}" );
+        ${listBox} = aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" );
+        ${summaryBox} = aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" );
+        ${printBox} = aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" );
 #set ($pageReadBox="${page.Name}_pageReadCheck")
 #set ($pageWriteBox="${page.Name}_pageWriteCheck")
 #set ($pageListBox="${page.Name}_pageListCheck")
 #set ($pageSumBox="${page.Name}_pageSumCheck")
 #set ($pagePrintBox="${page.Name}_pagePrintCheck")
         if( aacProvider.isReadable( "field.${table.Name}.${field.Name}" ) )
-            set${pageReadBox}( true );
+            ${pageReadBox} = true;
         if( aacProvider.isWritable( "field.${table.Name}.${field.Name}" ) )
-            set${pageWriteBox}( true );
+            ${pageWriteBox} = true;
         if( aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" ) )
-            set${pageListBox}( true );
+            ${pageListBox} = true;
         if( aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" ) )
-            set${pageSumBox}( true );
+            ${pageSumBox} = true;
         if( aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" ) )
-            set${pagePrintBox}( true );
+            ${pagePrintBox} = true;
 #end
 
 #foreach( $group in $page.Groups)
@@ -386,46 +380,46 @@
 #set ($listBox="${field.Name}_listCheck")
 #set ($summaryBox="${field.Name}_sumCheck")
 #set ($printBox="${field.Name}_printCheck")
-        set${readBox}( aacProvider.isReadable( "field.${table.Name}.${field.Name}" ) );
-        set${writeBox}( aacProvider.isWritable( "field.${table.Name}.${field.Name}" ) );
-        set${listBox}( aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" ) );
-        set${summaryBox}( aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" ) );
-        set${printBox}( aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" ) );
+        ${readBox} = aacProvider.isReadable( "field.${table.Name}.${field.Name}" );
+        ${writeBox} = aacProvider.isWritable( "field.${table.Name}.${field.Name}" );
+        ${listBox} = aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" );
+        ${summaryBox} = aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" );
+        ${printBox} = aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" );
 #set ($groupReadBox="${group.Name}_groupReadCheck")
 #set ($groupWriteBox="${group.Name}_groupWriteCheck")
 #set ($groupListBox="${group.Name}_groupListCheck")
 #set ($groupSumBox="${group.Name}_groupSumCheck")
 #set ($groupPrintBox="${group.Name}_groupPrintCheck")
         if( aacProvider.isReadable( "field.${table.Name}.${field.Name}" ) )
-            set${groupReadBox}( true );
+            ${groupReadBox} = true;
         if( aacProvider.isWritable( "field.${table.Name}.${field.Name}" ) )
-            set${groupWriteBox}( true );
+            ${groupWriteBox} = true;
         if( aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" ) )
-            set${groupListBox}( true );
+            ${groupListBox} = true;
         if( aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" ) )
-            set${groupSumBox}( true );
+            ${groupSumBox} = true;
         if( aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" ) )
-            set${groupPrintBox}( true );
+            ${groupPrintBox} = true;
 #end
 #end
 #end
 
 #foreach( $select in $table.SelectsNotHidden)
 #set ($selectBox="${select.Name}_selectCheck")
-        set${selectBox}( aacProvider.isReadable( "select.${table.Name}.${select.Name}" ) );
+        ${selectBox} = aacProvider.isReadable( "select.${table.Name}.${select.Name}" );
 #end
 #foreach( $action in $table.Actions)
 #set ($actionBox="${action.Name}_actionCheck")
-        set${actionBox}( aacProvider.isReadable( "action.${table.Name}.${action.Name}") );
+        ${actionBox} = aacProvider.isReadable( "action.${table.Name}.${action.Name}");
 #end
     }
 
     private AuthAndConfigProvider getAuthsForSelection() 
         throws EquandaException
     {
-        if( tablesPage.getRoleName() != null ){
+        if( getRoleName() != null ) {
             // a Role has been selected, update the boxes based on this
-            return LoginCache.getRoleFromCache( tablesPage.getRoleName() );
+            return LoginCache.getRoleFromCache( getRoleName() );
         }
         else{
             // update the boxes based on the current user
@@ -435,16 +429,16 @@
     
     /**
      * This method should be called when the rights have been set in the cache.
-     * It then ensures these rights are persistant.
+     * It then ensures these rights are persisted.
      */
     private void commitAuths()
         throws EquandaException
     {
         ParsedAuthAndConfigProvider aacProvider = (ParsedAuthAndConfigProvider)getAuthsForSelection();
 
-        if( this.roleName != null )
+        if( getRoleName() != null )
         {
-            EquandaRole thisRole = EquandaRole.selectRole(this.roleName);
+            EquandaRole thisRole = EquandaRole.selectRole( getRoleName() );
             thisRole.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
             thisRole.equandaUpdate();
         }

Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm	2009-09-22 10:04:00 UTC (rev 1158)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm	2009-09-22 15:30:16 UTC (rev 1159)
@@ -11,9 +11,9 @@
         <input t:type="submit" value="equanda-message:button.Cancel" t:id="cancel"/>
    </t:parameter>
 
-   <br />
-   <br />
+    <t:if test="roleName"><p>${dollar}{equanda-message:authAndConfig.label.Role}${dollar}{roleName}</p></t:if>
 
+
 ## Render fields
 #foreach( $page in $table.Pages )
 #parse( "pages/AuthAndConfigField.tml.vm" )
@@ -30,8 +30,13 @@
 
 ## Render selects
 #if( !$table.SelectsNotHidden.isEmpty() )
-    <fieldset>
-        <legend>${dollar}{equanda-message:SelectsSection}</legend>
+    <fieldset id="pageSelects">
+        <legend>
+            ${dollar}{equanda-message:SelectsSection}
+            <input t:id="selectCheck" name="selectCheck" value="selectCheck"
+                onclick="eqHandlePageBox( selectCheck, 'pageSelects', '_selectCheck' )"
+                t:type="CheckBox"/>
+        </legend>
 #foreach( $select in $table.SelectsNotHidden)
 #set ($selectBox="${select.Name}_selectCheck")
         <div class="nameCol">${dollar}{equanda-message:select.${table.Name}.${select.Name}}</div>
@@ -47,8 +52,13 @@
    
 ## Render actions
 #if( !$table.Actions.isEmpty() )
-	<fieldset>
-        <legend>${dollar}{equanda-message:ActionsSection}</legend>
+	<fieldset id="pageActions">
+        <legend>
+            ${dollar}{equanda-message:ActionsSection}
+            <input t:id="actionCheck" name="actionCheck" value="actionCheck"
+                onclick="eqHandlePageBox( actionCheck, 'pageActions', '_actionCheck' )"
+                t:type="CheckBox"/>
+        </legend>
 #foreach( $action in $table.Actions)
 #set ($actionBox="${action.Name}_actionCheck")
         <div class="nameCol">${dollar}{equanda-message:action.${table.Name}.${action.Name}}</div>

Modified: branches/0.9.4.1/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js
===================================================================
--- branches/0.9.4.1/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js	2009-09-22 10:04:00 UTC (rev 1158)
+++ branches/0.9.4.1/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js	2009-09-22 15:30:16 UTC (rev 1159)
@@ -108,16 +108,19 @@
             setFieldChecks( false, fieldSetId, inputId );
         }
 
-        // set all page checks off
-        var pageWriteCheck = $$( 'fieldSet#' + fieldSetId + " input#" + pageWriteCheckStr );
-        if( pageWriteCheck.length != 0 )
+        if( pageWriteCheckStr )
         {
-            pageWriteCheck[ 0 ].checked = false;
+            // set all page checks off
+            var pageWriteCheck = $$( 'fieldSet#' + fieldSetId + " input#" + pageWriteCheckStr );
+            if( pageWriteCheck.length != 0 )
+            {
+                pageWriteCheck[ 0 ].checked = false;
+            }
+
+            pageListCheck.checked = false;
+            pageSummaryCheck.checked = false;
+            pagePrintCheck.checked = false;
         }
-
-        pageListCheck.checked = false;
-        pageSummaryCheck.checked = false;
-        pagePrintCheck.checked = false;
     }
     else if( pageReadBox.checked )
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb	Mar	Apr	May	Jun	Jul (6)	Aug (41)	Sep (44)	Oct (31)	Nov (54)	Dec (53)
2008	Jan (71)	Feb (66)	Mar (65)	Apr (73)	May (68)	Jun (69)	Jul (28)	Aug (49)	Sep (44)	Oct (77)	Nov (64)	Dec (78)
2009	Jan (50)	Feb (28)	Mar (41)	Apr (30)	May (5)	Jun (30)	Jul (6)	Aug (2)	Sep (18)	Oct (11)	Nov (6)	Dec (10)
2010	Jan (5)	Feb (8)	Mar (4)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

equanda-svn-commit Mailing List for equanda Java EE code generator (Page 3)

equanda-svn-commit — svn commits