Commit 3e596225 authored by kushalpandya's avatar kushalpandya

Update as per review feedback

parent 9a9bb024
...@@ -66,7 +66,7 @@ export default class ProtectedTagAccessDropdown { ...@@ -66,7 +66,7 @@ export default class ProtectedTagAccessDropdown {
self.$wrap.find(`.item-${item.type}`).removeClass('is-active'); self.$wrap.find(`.item-${item.type}`).removeClass('is-active');
} else { } else {
const $noOne = self.$wrap.find(`.is-active.item-${item.type}[data-role-name="No one"]`); const $noOne = self.$wrap.find(`.is-active.item-${item.type}[data-role-id="${self.noOneObj.id}"]`);
if ($noOne.length) { if ($noOne.length) {
$noOne.removeClass('is-active'); $noOne.removeClass('is-active');
self.removeSelectedItem(self.noOneObj); self.removeSelectedItem(self.noOneObj);
...@@ -430,10 +430,10 @@ export default class ProtectedTagAccessDropdown { ...@@ -430,10 +430,10 @@ export default class ProtectedTagAccessDropdown {
return ` return `
<li> <li>
<a href='#' class='${isActiveClass}'> <a href="#" class="${isActiveClass}">
<img src='${user.avatar_url}' class='avatar avatar-inline' width='30'> <img src="${user.avatar_url}" class="avatar avatar-inline" width="30">
<strong class='dropdown-menu-user-full-name'>${user.name}</strong> <strong class="dropdown-menu-user-full-name">${user.name}</strong>
<span class='dropdown-menu-user-username'>${user.username}</span> <span class="dropdown-menu-user-username">${user.username}</span>
</a> </a>
</li> </li>
`; `;
...@@ -441,13 +441,13 @@ export default class ProtectedTagAccessDropdown { ...@@ -441,13 +441,13 @@ export default class ProtectedTagAccessDropdown {
groupRowHtml(group, isActive) { groupRowHtml(group, isActive) {
const isActiveClass = isActive || ''; const isActiveClass = isActive || '';
const avatarEl = group.avatar_url ? `<img src='${group.avatar_url}' class='avatar avatar-inline' width='30'>` : ''; const avatarEl = group.avatar_url ? `<img src="${group.avatar_url}" class="avatar avatar-inline" width="30">` : '';
return ` return `
<li> <li>
<a href='#' class='${isActiveClass}'> <a href="#" class="${isActiveClass}">
${avatarEl} ${avatarEl}
<span class='dropdown-menu-group-groupname'>${group.name}</span> <span class="dropdown-menu-group-groupname">${group.name}</span>
</a> </a>
</li> </li>
`; `;
...@@ -458,7 +458,7 @@ export default class ProtectedTagAccessDropdown { ...@@ -458,7 +458,7 @@ export default class ProtectedTagAccessDropdown {
return ` return `
<li> <li>
<a href='#' class='${isActiveClass}' item-${role.type}' data-role-name="${role.text}"> <a href="#" class="${isActiveClass} item-${role.type}" data-role-id="${role.id}">
${role.text} ${role.text}
</a> </a>
</li> </li>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment