Merge pull request #11253 from piwik/3.x-dev3.0.2-b1

Release 3.0.2-b1

1 files changed, 31 insertions, 5 deletions

diff --git a/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js b/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js
index 4ed851d68d..55d2f34b64 100644
--- a/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js
+++ b/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js
@@ -43,13 +43,32 @@
         };
 
         this.setAccess = function (login, access) {
-    
+          login=piwik.helper.escape(piwik.helper.htmlEntities(login));
+            if ( $('[data-login="' + login + '"]').find("#"+access).has('.accessGranted').length ){
+                return;
+            }
             // callback called when the ajax request Update the user permissions is successful
             function successCallback(response) {
                 var mainDiv = $('[data-login="' + login + '"]');
-                mainDiv.find('.accessGranted')
-                    .attr("src", "plugins/UsersManager/images/no-access.png")
+                var grantedDiv = mainDiv.find('.accessGranted');
+                var currentSite = $(".sites_autocomplete").attr("sitename");
+                currentSite = piwik.helper.escape(piwik.helper.htmlEntities(currentSite));
+
+                grantedDiv.attr("src", "plugins/UsersManager/images/no-access.png")
                     .attr("class", "updateAccess")
+                    .attr("title", function(){
+                      var access = grantedDiv.parents('[id]').attr('id');
+                      if (access =="noaccess"){
+                        return _pk_translate('UsersManager_RemoveUserAccess', [login,currentSite])
+                      }
+                      else if (access =="view") {
+                        return _pk_translate('UsersManager_GiveUserAccess', [login,_pk_translate('UsersManager_PrivView'),currentSite]);
+                      }
+                      else if (access =="admin") {
+                        return _pk_translate('UsersManager_GiveUserAccess', [login,_pk_translate('UsersManager_PrivAdmin'),currentSite]);
+                      }
+                    })
+                    .off('click')
                     .click(function () {
                         var access = $(this).parent().attr('id')
                         self.setAccess(login, access);
@@ -58,7 +77,14 @@
                 mainDiv.find('#' + access + ' img')
                     .attr('src', "plugins/UsersManager/images/ok.png")
                     .attr('class', "accessGranted")
-                ;
+                    .attr("title",function(){
+                      if(access=="noaccess"){
+                        return _pk_translate('UsersManager_UserHasNoPermission', [login,_pk_translate('UsersManager_PrivNone'),currentSite]);
+                      }else {
+                        return _pk_translate('UsersManager_UserHasPermission', [login,access,currentSite]);
+                      }}
+                  )
+                  ;
 
                 var UI = require('piwik/UI');
                 var notification = new UI.Notification();
@@ -93,4 +119,4 @@
             }
         }
     }
-})();
\ No newline at end of file
+})();