Merge pull request openshift#813 from benjaminapetersen/membership-tooltip

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/membership.js

@@ -166,7 +166,10 @@ angular
           if(!role) {
             return;
           }
-          var noInfoMessage = 'There is no additional information about this role.';
+          // NOTE: hiding tooltip entirely for now, until descriptions merge:
+          // https://github.com/openshift/origin/pull/11328
+          // the tooltip will still work if roles are manually annotated
+          var noInfoMessage = ''; // prev: 'There is no additional information about this role.';
           var namespace = _.get(role, 'metadata.namespace');
           var name = _.get(role, 'metadata.name');
           var prefix = namespace ? (namespace + ' / ' + name + ': ') : '';

app/scripts/directives/actionChip.js

@@ -25,8 +25,8 @@ angular
       scope: {
         key: '=?',
         value: '=?',
-        keyHelp: '=?',
-        valueHelp: '=?',
+        keyHelp: '=?',    // optional, or empty string for false
+        valueHelp: '=',   // optional, or empty string for false
         action: '&?',     // callback fn,
         actionIcon: '=?', // default is pficon pficon-close
         showAction: '=?'  // bool to show-hide the action button

dist/scripts/scripts.js

@@ -4912,7 +4912,7 @@ name:b.metadata.name
 },
 roleHelp:function(a) {
 if (a) {
-var b = "There is no additional information about this role.", c = _.get(a, "metadata.namespace"), d = _.get(a, "metadata.name"), e = c ? c + " / " + d + ": " :"";
+var b = "", c = _.get(a, "metadata.namespace"), d = _.get(a, "metadata.name"), e = c ? c + " / " + d + ": " :"";
 return a ? e + (q(a, "description") || b) :b;
 }
 }
@@ -9956,7 +9956,7 @@ scope:{
 key:"=?",
 value:"=?",
 keyHelp:"=?",
-valueHelp:"=?",
+valueHelp:"=",
 action:"&?",
 actionIcon:"=?",
 showAction:"=?"