Changeset 250

Timestamp:

11/14/11 20:03:07 (13 years ago)

Author:

vmipsl

Message:

login

Location:

ether_megapoli/trunk/web

Files:

• resources/images/utils/ui-icons_cd0a0a_256x240.png (added)
• resources/jsp/megapoliHead.jsp (modified) (5 diffs)
• src/com/ether/ControllerEponge.java (modified) (3 diffs)

ether_megapoli/trunk/web/resources/jsp/megapoliHead.jsp

@@ -19 +19 @@
 
         /** ************ CREATE ************ **/
-        this.createTitleTools();
+        this.createTitle();
+        this.createTools();
         this.createLeftSlides();
-        this.updateLogoEther();
     },
 
     // CREATES ********************************************************
-    createTitleTools: function()
+    createTitle: function()
     {
         this.containerTitle.addClass( "containerTitle" );
         this.containerTitle.html( templateTexts["app.fulltitle"] );
-
+    },
+
+    createTools: function()
+    {
         this.createLoginForm();
         this.createLogin();
@@ -45 +48 @@
         divSmallLogoEther.append( '<a href="http://ether.ipsl.jussieu.fr" target="help"><img src="resources/images/logo_Ether.jpg" width="40px" height="40px"/></a>' );
         this.containerTools.append( divSmallLogoEther );
+
+        this.updateLogoEther();
     },
 
@@ -182 +187 @@
     onHandleLogin: function( result )
     {
-        var errors = jQuery.parseJSON( result ).errors;
-        alert( errors );
+        this.errors = jQuery.parseJSON( result ).errors;
+        this.jSONUser = jQuery.parseJSON( result ).jSONPeople != null ? jQuery.parseJSON( result ).jSONPeople : false;
+        if( this.errors == null )
+            this.hideLogin();
+        else
+            this.displayLoginErrors();
     },
 
@@ -211 +220 @@
     },
 
-    onClickLogin: function( result )
-    {
-        alert( "paf" );
-    },
-
-    onClickLoginError: function( resutl )
-    {
-        alert( "error" );
-    },
     /**
      * This method display a small Ether logo if the screen is too small to contain the big one
@@ -237 +237 @@
             $( "#smallLogoEther" ).hide();
         }
+    },
+
+    hideLogin: function()
+    {
+        this.containerTools.empty();
+        this.createTools();
+    },
+
+    displayLoginErrors: function()
+    {
+        alert( "displayErrors" );
     }
 } );

ether_megapoli/trunk/web/src/com/ether/ControllerEponge.java

@@ -51 +51 @@
     {
         final ActionErrors errors = new ActionErrors();
+        final JSONObject jSONPeople = new JSONObject();
 
         if( login != null && pwd != null )
@@ -61 +62 @@
                     errors.add( ActionErrors.GLOBAL_MESSAGE, new ActionError( "errors.logon.notFound", Context.getWebmaster( request ) ) );
                 else
+                {
                     request.getSession().setAttribute( "SES_USER", people );
+                    jSONPeople.put( "name", people.getNom() );
+                    jSONPeople.put( "firstName", people.getPrenom() );
+                    jSONPeople.put( "role", people.getRoles() );
+                }
             }
             catch( Exception e )
@@ -74 +80 @@
             result.put( "errors", errors );
 
+        result.put("jSONPeople", jSONPeople);
         return result;
     }