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

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

Revision: 839
          http://equanda.svn.sourceforge.net/equanda/?rev=839&view=rev
Author:   brian_reynolds
Date:     2008-11-07 16:26:26 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
Removed the buttons enum, and replace with objects for nextPage and returnPage. 
ENsure warning is displayed during render if user is not gui admin.

Modified Paths:
--------------
    trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
    trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm

Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
===================================================================

--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm	2008-11-07 16:24:21 UTC (rev 838)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm	2008-11-07 16:26:26 UTC (rev 839)
@@ -41,14 +41,12 @@
 
 import org.apache.tapestry5.SelectModel;
 import org.apache.tapestry5.OptionModel;
-import org.apache.tapestry5.ValidationTracker;
-import org.apache.tapestry5.annotations.Environmental;
 import org.apache.tapestry5.annotations.InjectPage;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.equanda.persistence.ExceptionCodes;
+import org.apache.tapestry5.annotations.Persist; 
 import org.equanda.persistence.EquandaPersistenceException;
-import org.equanda.persistence.Uoid;
 import org.equanda.t5gui.services.LoginInfoService;
+import org.apache.tapestry5.ComponentResources;
 import org.equanda.tapestry5.base.EquandaOptionModel;
 import org.equanda.tapestry5.base.EquandaSelectModel;
 import org.equanda.client.LoginInfo;
@@ -61,26 +59,36 @@
 {
     private static final Logger logger = Logger.getLogger( AuthAndConfigRoles.class );
     
-    @Environmental
-    private ValidationTracker validationTracker;
-    
     @Inject
     private LoginInfoService loginInfoService;
     
+    @Inject
+    private ComponentResources resources;
+    
     @InjectPage 
     private AuthAndConfigTables tablePage;
+
+    private Object nextPage;
+        
+    private String roleName;
+    public String getRoleName()
+    {
+        return roleName;
+    }
+    public void setRoleName( String roleName )
+    {
+        this.roleName = roleName;
+    }
     
-    private enum buttons { OK_BUTTON, CANCEL_BUTTON };
-    private buttons selectedButton;
-    
-    private Uoid roleId;
-    public Uoid getRoleId()
+    @Persist
+    private boolean isGuiAdmin;
+    public boolean getIsGuiAdmin()
     {
-        return roleId;
+        return this.isGuiAdmin;
     }
-    public void setRoleId( Uoid roleId )
+    public void setIsGuiAdmin( boolean isGuiAdmin )
     {
-        this.roleId = roleId;
+        this.isGuiAdmin = isGuiAdmin;
     }
 
     public SelectModel getRolesChoiceModel()
@@ -92,7 +100,7 @@
 
             for ( EquandaRole role : coll )
             {
-                list.add( new EquandaOptionModel (role.getRoleName(), role.getId() ) );
+                list.add( new EquandaOptionModel (role.getRoleName(), role.getRoleName() ) );
             }
         }
         catch(Exception e){
@@ -103,65 +111,44 @@
         return new EquandaSelectModel( null, list );
     }
     
-    public void onSelectedFromOk()
-        throws EquandaPersistenceException
+    public void onActivate()
     {
-        selectedButton = buttons.OK_BUTTON;
+        setIsGuiAdmin(false);
         
-        LoginInfo li = loginInfoService.getLoginInfo();
-        EquandaUser theUser = (EquandaUser)li.getUser();
-        
-        if( theUser == null )
+        try
         {
-            validationTracker.recordError( "The Equanda User information could not be found" );
-        }
-        else
-        {
-            boolean isGuiAdmin = false;
-        
-            try
-            {
-                for( EquandaRole thisRole : theUser.getRoles() )
-                {   
-                    if( thisRole.isGuiAdministrator() == true )
-                    {
-                        isGuiAdmin = true;
-                        break;                
-                    }
-                }
+            LoginInfo li = loginInfoService.getLoginInfo();
+            EquandaUser theUser = (EquandaUser)li.getUser();
             
-                if( isGuiAdmin == false )
+            for( EquandaRole thisRole : theUser.getRoles() )
+            {   
+                if( thisRole.isGuiAdministrator() == true )
                 {
-                    validationTracker.recordError( "The user " + theUser.getUserName() + " is prohibited from using this page." );
+                    setIsGuiAdmin(true);
+                    break;
                 }
-                else
-                {
-                    tablePage.setIsGuiAdmin(true);
-                }
-                
-                tablePage.refreshBoxes( false );
             }
-            catch(Exception e)
-            {
-                logger.error( e, e );
-            }
         }
-        
-        tablePage.setRoleId( this.getRoleId() );
-        tablePage.setPrevPage( "AuthAndConfigRoles" ); // TODO: Is there a velocity object I can use here? 
+        catch(Exception e)
+        {
+            logger.error( e, e );
+        }
     }
     
-    public void onSelectedFromCancel()
+    public void onSelectedFromOk()
+        throws EquandaPersistenceException
     {
-        selectedButton = buttons.CANCEL_BUTTON;
+        if( getIsGuiAdmin() )
+            nextPage = tablePage;
+            
+        tablePage.initPage( getRoleName(), getIsGuiAdmin() );
+        tablePage.refreshBoxes();
+        tablePage.setReturnPage( resources.getPage() ); 
     }
-        
+    
     public Object onSuccess()
     {
-        if( selectedButton == buttons.OK_BUTTON )
-            return tablePage;
-        return null;
+        return nextPage;
     }
-
 }
 

Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm	2008-11-07 16:24:21 UTC (rev 838)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm	2008-11-07 16:26:26 UTC (rev 839)
@@ -1,14 +1,20 @@
 <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
 
     <t:parameter name="title">${dollar}{equanda-message:authAndConfig.title.Roles}</t:parameter>
+
+    <t:if test="isGuiAdmin">
+        <p>Choose the role you wish to edit, or leave blank to edit the current user</p>
+        <br/>
+        <select t:type="Select" t:model="RolesChoiceModel" t:value="roleName" t:blankOption="ALWAYS"/>
+
+        <t:parameter name="else">
+        	<b><font color="red">This user is prohibited from accessing this page.</font></b> 
+        </t:parameter>
+    </t:if>
     
-    <p>Choose the role you wish to edit, or leave blank to edit the current user</p>
-    <br/>
-    <select t:type="Select" t:model="RolesChoiceModel" t:value="roleId"  t:blankOption="ALWAYS"/>
-    
-    <t:parameter name="buttons">
+   	<t:parameter name="buttons">
         <input class="defaultSubmit" t:type="submit" value="equanda-message:button.OK" t:id="ok"/>
-       	<input t:type="submit" value="equanda-message:button.Cancel" t:id="cancel"/>
-    </t:parameter>
-  
+        <input t:type="submit" value="equanda-message:button.Cancel" t:id="cancel"/>
+    </t:parameter>
+
 </t:layout>
\ No newline at end of file


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 16)

equanda-svn-commit — svn commits