[elvystrac] r1864 - authorization after login upgraded - bug fixed (admin goes to list of users, not to the list of elvys)

From: elvys@xxxxxxxxxxxxxxxxxxxxxx
To: elvystrac@xxxxxxxxxxxxx
Date: Thu, 25 Feb 2010 11:04:32 +0100
Author: DavidK
Date: 2010-02-25 11:04:32 +0100 (Thu, 25 Feb 2010)
New Revision: 1864

Modified:
   
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserListBean.java
   
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserLoginBean.java
   trunk/server/webServer2/WebContent/WEB-INF/faces-navigation.xml
Log:
authorization after login upgraded - bug fixed (admin goes to list of users, 
not to the list of elvys)

Modified: 
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserListBean.java
===================================================================
--- 
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserListBean.java
  2010-02-25 09:09:34 UTC (rev 1863)
+++ 
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserListBean.java
  2010-02-25 10:04:32 UTC (rev 1864)
@@ -47,6 +47,9 @@
 
 
        public List<UserListRecord> getUserRecords() {
+               if (userRecords == null) {
+                       prepareListOfUsers();
+               }
                return userRecords;
        }
 

Modified: 
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserLoginBean.java
===================================================================
--- 
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserLoginBean.java
 2010-02-25 09:09:34 UTC (rev 1863)
+++ 
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserLoginBean.java
 2010-02-25 10:04:32 UTC (rev 1864)
@@ -311,10 +311,38 @@
                        String message = 
CommonUtils.prepareErrorMessage(NOT_FOUND, "user", formUsername, "ip", ip, 
"host", host);
                        log.debug(message);
                }
-
-               return whatToReturn;
+               
+               if (whatToReturn.equals("success")) {
+                       String destination = 
selectDestinationAndPrepare(competency);
+                       return destination;
+               } else {
+                       return whatToReturn;
+               }
+               
        }
        
+       /**
+        * Selects output navigation message, where to go
+        * @param holder
+        */
+       private String selectDestinationAndPrepare(UserCompetencyHolder holder) 
{
+               if (holder.getCanPlan() || holder.getCanManageElvyses()) {
+                       // prepare list of elvyses
+                       
+                       
+                       return "ok_layoutlist";
+               } else if (holder.getCanCreateAnyUser()) {
+                       // prepare list of users
+                       
+                       return "ok_userlist";
+               } else {
+                       String message = "Cannot choose page to go on after 
login";
+                       log.error(message + holder.toString());
+                       throw new Error(message);
+               }
+               
+       }
+       
        public String logout() {
                String username = user.getUsername();
                this.loggedIn = false;

Modified: trunk/server/webServer2/WebContent/WEB-INF/faces-navigation.xml
===================================================================
--- trunk/server/webServer2/WebContent/WEB-INF/faces-navigation.xml     
2010-02-25 09:09:34 UTC (rev 1863)
+++ trunk/server/webServer2/WebContent/WEB-INF/faces-navigation.xml     
2010-02-25 10:04:32 UTC (rev 1864)
@@ -5,10 +5,14 @@
  <navigation-rule>
   <from-view-id>/login.xhtml</from-view-id>
   <navigation-case>
-   <from-outcome>success</from-outcome>
+   <from-outcome>ok_layoutlist</from-outcome>
    <to-view-id>/secured/elvysrel/listOfElvyses.xhtml</to-view-id>
   </navigation-case>
   <navigation-case>
+   <from-outcome>ok_userlist</from-outcome>
+   <to-view-id>/secured/userrel/listOfUsers.xhtml</to-view-id>
+  </navigation-case>
+  <navigation-case>
    <from-outcome>failure</from-outcome>
    <to-view-id>/login.xhtml</to-view-id>
   </navigation-case>
@@ -16,10 +20,14 @@
  <navigation-rule>
   <from-view-id>/reconnect.xhtml</from-view-id>
   <navigation-case>
-   <from-outcome>success</from-outcome>
+   <from-outcome>ok_layoutlist</from-outcome>
    <to-view-id>/secured/elvysrel/listOfElvyses.xhtml</to-view-id>
   </navigation-case>
   <navigation-case>
+   <from-outcome>ok_userlist</from-outcome>
+   <to-view-id>/secured/userrel/listOfUsers.xhtml</to-view-id>
+  </navigation-case>
+  <navigation-case>
    <from-outcome>failure</from-outcome>
    <to-view-id>/login.xhtml</to-view-id>
   </navigation-case>
[elvystrac] r1864 - authorization after login upgraded - bug fixed (admin goes to list of users, not to the list of elvys)

Other related posts:
