Commit: 429ae7d7920c85a623d534084e566473e7c35348 - allura (git)

allura

Commit MetaInfo

• Revision: 429ae7d7920c85a623d534084e566473e7c35348 (tree)
• Zeit: 2012-05-15 00:09:11
• Autor: Jenny Steele <jsteele@geek...>
• Commiter: Yaroslav Luzin

Log Message

[#3598] Inherited permissions now keep an up to date inherit message on the permission tooltip

Ändern Zusammenfassung

• modified: Allura/allura/public/nf/js/project_groups.js

Diff

--- a/Allura/allura/public/nf/js/project_groups.js
+++ b/Allura/allura/public/nf/js/project_groups.js
@@ -77,10 +77,12 @@ $(function() {
       for(var i=0, len=data[k].length; i<len; ++i){
         var item = data[k][i];
         var perm_holder = group_holder.find('li[data-permission='+item.name+']');
+        var perm_link = perm_holder.find('a');
         if(!perm_holder.hasClass(item.has)){
           perm_holder.effect('highlight', {}, 2000);
           var icon = perm_holder.find('b');
-          perm_holder.attr('class',item.has).find('a').attr('title',item.text);
+          perm_holder.attr('class',item.has);
+          perm_link.attr('title',item.text);
           if(item.has=="yes"){
             icon.attr('class','ico ico-check').attr('data-icon','3');
           }
@@ -91,7 +93,11 @@ $(function() {
             icon.attr('class','ico ico-noentry').attr('data-icon','d');
           }
           perm_holder.find('span').remove();
-          perm_holder.find('a').show();
+          perm_link.show();
+        }
+        // inherited permissions may change where they're inherited from
+        else if(item.has=="inherit"){
+          perm_link.attr('title',item.text);
         }
       }
     }