Skip to content

Commit 3a4504e

Browse files
Merge pull request #2627 from benjaminapetersen/issue/2614/membership-role-title
Automatic merge from submit-queue. Add titles to roles in dropdown list on membership page Partial Fix for 2614, at least as a short term until we decide on a better solution. See the conversation for more details. Adds titles to the menu items: ![screen shot 2018-01-03 at 11 18 25 am](https://user-images.githubusercontent.com/280512/34528830-1d9208b4-f078-11e7-96b3-1585bce2b90d.png) Re: #2614
2 parents 9bac300 + 780da67 commit 3a4504e

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

app/views/membership.html

+13-5
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ <h3>
125125
ng-model="subject.newRole"
126126
theme="bootstrap"
127127
search-enabled="true"
128-
title="Select a new role for {{subjectKind.name}}"
128+
title="Select a new role for {{subject.name}}"
129129
class="select-role"
130130
flex>
131131
<ui-select-match
@@ -134,8 +134,12 @@ <h3>
134134
</ui-select-match>
135135
<ui-select-choices
136136
repeat="role as role in filteredRoles | filter: excludeExistingRoles(subject.roles) | filter: { metadata: { name: $select.search } } track by (role | uid)">
137-
<div ng-bind-html="role.metadata.name | highlight: $select.search"></div>
138-
<div ng-if="role | annotation : 'description'">
137+
<div
138+
ng-bind-html="role.metadata.name | highlight: $select.search"
139+
title="{{role.metadata.name}}"></div>
140+
<div
141+
ng-if="role | annotation : 'description'"
142+
title="{{role.metadata.name}}">
139143
<small>{{role | annotation : 'description'}}</small>
140144
</div>
141145
</ui-select-choices>
@@ -245,8 +249,12 @@ <h3>
245249
</ui-select-match>
246250
<ui-select-choices
247251
repeat="role as role in filteredRoles | filter: { metadata: { name: $select.search } } track by (role | uid)">
248-
<div ng-bind-html="role.metadata.name | highlight: $select.search"></div>
249-
<div ng-if="role | annotation : 'description'">
252+
<div
253+
ng-bind-html="role.metadata.name | highlight: $select.search"
254+
title="{{role.metadata.name}}"></div>
255+
<div
256+
ng-if="role | annotation : 'description'"
257+
title="{{role.metadata.name}}">
250258
<small>{{role | annotation : 'description'}}</small>
251259
</div>
252260
</ui-select-choices>

dist/scripts/templates.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -10747,13 +10747,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1074710747
"</div>\n" +
1074810748
"<div ng-if=\"mode.edit\" class=\"col-add-role\">\n" +
1074910749
"<div row>\n" +
10750-
"<ui-select ng-if=\"filteredRoles.length\" ng-model=\"subject.newRole\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a new role for {{subjectKind.name}}\" class=\"select-role\" flex>\n" +
10750+
"<ui-select ng-if=\"filteredRoles.length\" ng-model=\"subject.newRole\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a new role for {{subject.name}}\" class=\"select-role\" flex>\n" +
1075110751
"<ui-select-match placeholder=\"Select a role\">\n" +
1075210752
"<span ng-bind=\"subject.newRole.metadata.name\"></span>\n" +
1075310753
"</ui-select-match>\n" +
1075410754
"<ui-select-choices repeat=\"role as role in filteredRoles | filter: excludeExistingRoles(subject.roles) | filter: { metadata: { name: $select.search } } track by (role | uid)\">\n" +
10755-
"<div ng-bind-html=\"role.metadata.name | highlight: $select.search\"></div>\n" +
10756-
"<div ng-if=\"role | annotation : 'description'\">\n" +
10755+
"<div ng-bind-html=\"role.metadata.name | highlight: $select.search\" title=\"{{role.metadata.name}}\"></div>\n" +
10756+
"<div ng-if=\"role | annotation : 'description'\" title=\"{{role.metadata.name}}\">\n" +
1075710757
"<small>{{role | annotation : 'description'}}</small>\n" +
1075810758
"</div>\n" +
1075910759
"</ui-select-choices>\n" +
@@ -10805,8 +10805,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1080510805
"<span ng-bind=\"newBinding.newRole.metadata.name\"></span>\n" +
1080610806
"</ui-select-match>\n" +
1080710807
"<ui-select-choices repeat=\"role as role in filteredRoles | filter: { metadata: { name: $select.search } } track by (role | uid)\">\n" +
10808-
"<div ng-bind-html=\"role.metadata.name | highlight: $select.search\"></div>\n" +
10809-
"<div ng-if=\"role | annotation : 'description'\">\n" +
10808+
"<div ng-bind-html=\"role.metadata.name | highlight: $select.search\" title=\"{{role.metadata.name}}\"></div>\n" +
10809+
"<div ng-if=\"role | annotation : 'description'\" title=\"{{role.metadata.name}}\">\n" +
1081010810
"<small>{{role | annotation : 'description'}}</small>\n" +
1081110811
"</div>\n" +
1081210812
"</ui-select-choices>\n" +

0 commit comments

Comments
 (0)