Changeset 290 for ether_megapoli/trunk/web/resources/js

Timestamp:

12/07/11 16:10:28 (13 years ago)

Author:

vmipsl

Message:

Ajout bouton BO

Location:

ether_megapoli/trunk/web/resources/js/classesForJQuery

Files:

• Button.js (modified) (2 diffs)
• LoginButton.js (modified) (8 diffs)
• etherHelper.js (modified) (1 diff)

ether_megapoli/trunk/web/resources/js/classesForJQuery/Button.js

@@ -19 +19 @@
         this.parent = param.parent ? param.parent : false;
         this.value = param.value ? param.value : "";
+        this.title = param.title ? param.title : false;
         this.className = param.className ? param.className : false;
         this.classNameText = param.classNameText ? param.classNameText : false;
@@ -33 +34 @@
         if( this.className )
             this.divContainer.addClass( this.className );
-        this.divContainer.attr( {id:this.id} );
+        if( this.title )
+            this.divContainer.attr( {id:this.id, title:this.title} );
+        else
+            this.divContainer.attr( {id:this.id} );
         if( this.parent )
             this.parent.append( this.divContainer );

ether_megapoli/trunk/web/resources/js/classesForJQuery/LoginButton.js

@@ -13 +13 @@
         // Init
         this.parent = param.parent ? param.parent : document.body;
-        this.onClickLogin = param.anotherOnClickLogin ? param.anotherOnClickLogin : this.onClickLogin;
-        this.onClickLogout = param.anotherOnClickLogout ? param.anotherOnClickLogout : this.onClickLogout;
+        this.anotherOnClickLogin = param.anotherOnClickLogin ? param.anotherOnClickLogin : false;
+        this.anotherOnClickLogout = param.anotherOnClickLogout ? param.anotherOnClickLogout : false;
         this.jSONUser = param.jSONUser ? param.jSONUser : false;
         this.urlLogin = param.urlLogin ? param.urlLogin : false;
@@ -31 +31 @@
         this.forgotUNPText = param.forgotUNPText ? param.forgotUNPText : loginTexts["data.authentification.loginForget"];
         this.inscriptionText = param.inscriptionText ? param.inscriptionText : loginTexts["data.authentification.inscription"];
-        this.text1 = param.text1 ? param.text1 : loginTexts["app.admin"];
         this.errorText = param.errorText ? param.errorText : loginTexts[this.errors];
     },
@@ -44 +43 @@
     {
         return this.jSONUser;
+    },
+
+    getJSONUserRole: function()
+    {
+        return this.jSONUser.role;
     },
 
@@ -115 +119 @@
         if( this.jSONUser )
         {
-            var textLogin = this.jSONUser.name + " " + this.jSONUser.firstName;
-            // TODO : revoir les rÃŽles
-            if( this.jSONUser.role && "COORDINATOR" == this.jSONUser.role )
-                textLogin += " (" + this.text1 + ")";
+            var textLogin = this.jSONUser.name + " " + this.jSONUser.firstName + " (" + loginTexts[this.jSONUser.role] + ")";
 
             var loginButton = new ComplexButton( {value:textLogin, parent:this.parent, id:"button_login", classNameToAdd: this.classNameToAdd} );
@@ -169 +170 @@
     },
 
-    updateLogin: function()
+    updateLoginOrLogout: function()
     {
         this.parent.empty();
@@ -200 +201 @@
             return;
 
-        // TODO : passer en crypter ces infos !!!!!
         var login = $( "#login" ).val();
         var pwd = $( "#pwd" ).val();
@@ -226 +226 @@
         this.setJSONUser( null != jQuery.parseJSON( result ).jSONPeople ? jQuery.parseJSON( result ).jSONPeople : false );
         if( null == this.errors )
-            this.updateLogin();
+            this.updateLoginOrLogout();
         else
             this.displayLoginErrors( loginTexts[this.errors] );
+
+        if( this.anotherOnClickLogin )
+            this.anotherOnClickLogin();
     },
 
@@ -237 +240 @@
         {
             this.setJSONUser( false );
-            this.updateLogin();
+            this.updateLoginOrLogout();
         }
         else
             this.displayLoginErrors( loginTexts[this.errors] );
+
+        if( this.anotherOnClickLogout )
+            this.anotherOnClickLogout();
     },
 

ether_megapoli/trunk/web/resources/js/classesForJQuery/etherHelper.js

@@ -17 +17 @@
 {
     return getLoginModule().getJSONUser();
+}
+
+function getJSONUserRole()
+{
+    return getLoginModule().getJSONUserRole();
 }