External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 12:20:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2091 from kensible/2090-userEditLists

Browse Source 
Fixed list message boxes for super and non-super user edits
This commit is contained in:
kensible 2016-06-01 09:26:59 -04:00
commit 47afb3daac
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/forms/Users.js
View File

@ -138,8 +138,6 @@ export default
iterator: 'team',
open: false,
index: false,
suppressEmptyText: true,
actions: {},
fields: {

7
awx/ui/client/src/shared/form-generator.js
View File

@ -1844,10 +1844,11 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
// Show the "no items" box when loading is done and the user isn't actively searching and there are no results
// Allow for the suppression of the empty list text to avoid duplication between form generator and list generator
if(!collection.suppressEmptyText || collection.suppressEmptyText === false) {
var emptyListText = (collection.emptyListText) ? collection.emptyListText : "PLEASE ADD ITEMS TO THIS LIST";
html += "<div class=\"List-noItems\" ng-show=\"" + collection.iterator + "Loading == false && " + collection.iterator + "_active_search == false && " + collection.iterator + "_total_rows < 1\">" + emptyListText + "</div>";
}
html += '<div ng-hide="is_superuser">';
html += "<div class=\"List-noItems\" ng-hide=\"is_superuser\" ng-show=\"" + collection.iterator + "Loading == false && " + collection.iterator + "_active_search == false && " + collection.iterator + "_total_rows < 1\">" + emptyListText + "</div>";
html += '</div>';
//}
html += `
<div class=\"List-noItems\" ng-show=\"is_superuser\">