External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 23:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Inventory add/edit/delete group buttons now working. Inventory detail form now maintains values independently so common fields such as Name and Description do not get overridden by Group Add/Edit modal dialog.

Browse Source
This commit is contained in:
chouseknecht
2013-06-03 12:59:35 -04:00
parent b19e1dd97a
commit eca7b3888f
6 changed files with 101 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansibleworks/ui/static/lib/ansible/form-generator.js
View File

@@ -643,9 +643,9 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
html += "<div class=\"inventory-buttons pull-right\">";
html += "<button ng-click=\"addGroup()\" ng-hide=\"groupAddHide\" id=\"inv-group-add\" " +
"class=\"btn btn-mini btn-success\"><i class=\"icon-plus\"></i> Add Group</button>";
html += "<button ng-hide=\"groupEditHide\" id=\"inv-group-edit\" class=\"btn btn-mini btn-success\">" +
html += "<button ng-click=\"editGroup()\" ng-hide=\"groupEditHide\" id=\"inv-group-edit\" class=\"btn btn-mini btn-success\">" +
"<i class=\"icon-edit\"></i> Edit Group</button>";
html += "<button ng-hide=\"groupDeleteHide\" id=\"inv-group-delete\" class=\"btn btn-mini btn-danger\">" +
html += "<button ng-click=\"deleteGroup()\" ng-hide=\"groupDeleteHide\" id=\"inv-group-delete\" class=\"btn btn-mini btn-danger\">" +
"<i class=\"icon-remove\"></i> Delete Group</button>";
html += "</div>\n";
html += "<div id=\"tree-view\"></div>\n";

14
ansibleworks/ui/static/lib/ansible/utilities.js
View File

@@ -55,9 +55,17 @@ angular.module('Utilities',[])
else if (form) {
var fieldErrors = false;
for (var field in form.fields ) {
if (data[field]) {
scope[field + '_api_error'] = data[field][0];
fieldErrors = true;
if (form.fields[field].realName) {
if (data[form.fields[field].realName]) {
scope[field + '_api_error'] = data[form.fields[field]][0];
fieldErrors = true;
}
}
else {
if (data[field]) {
scope[field + '_api_error'] = data[field][0];
fieldErrors = true;
}
}
}
if ( (!fieldErrors) && defaultMsg) {