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

Fixed minor bugs lingering from package upgrades. Org lookup on User add page was throwing a js error. Flash message was not clearing on modal display. Store link was not working from modal button.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-02-13 16:19:21 +00:00
parent 69b91afaf2
commit 9aea64eb3f
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/static/js/helpers/Lookup.js
View File

@@ -104,7 +104,7 @@ angular.module('LookUpHelper', ['RestServices', 'Utilities', 'SearchHelper', 'Pa
listScope['toggle_' + list.iterator] = function (id) { listScope['toggle_' + list.iterator] = function (id) {
var i; var i;
for (i = 0; i < scope[list.name].length; i++) { for (i = 0; i < listScope[list.name].length; i++) {
if (listScope[list.name][i].id === id) { if (listScope[list.name][i].id === id) {
listScope[list.name][i].checked = '1'; listScope[list.name][i].checked = '1';
listScope[list.name][i].success_class = 'success'; listScope[list.name][i].success_class = 'success';
@@ -135,7 +135,6 @@ angular.module('LookUpHelper', ['RestServices', 'Utilities', 'SearchHelper', 'Pa
listScope.lookupPostRefreshRemove = scope.$on('PostRefresh', function () { listScope.lookupPostRefreshRemove = scope.$on('PostRefresh', function () {
var fld, i; var fld, i;
for (fld in list.fields) { for (fld in list.fields) {
if (list.fields[fld].type && list.fields[fld].type === 'date') { if (list.fields[fld].type && list.fields[fld].type === 'date') {
//convert dates to our standard format //convert dates to our standard format
for (i = 0; i < scope[list.name].length; i++) { for (i = 0; i < scope[list.name].length; i++) {

1
awx/ui/static/lib/ansible/form-generator.js
View File

@@ -127,6 +127,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
} }
if (options.modal) { if (options.modal) {
$rootScope.flashMessage = null;
this.scope.formModalActionDisabled = false; this.scope.formModalActionDisabled = false;
this.scope.formModalInfo = false; //Disable info button for default modal this.scope.formModalInfo = false; //Disable info button for default modal
if (form) { if (form) {

6
awx/ui/static/lib/ansible/license.js
View File

@@ -66,8 +66,7 @@ angular.module('License', ['RestServices', 'Utilities', 'FormGenerator', 'Prompt
"the Ansible online store</a>. Would you like to purchase or extend your license now?</p>", "the Ansible online store</a>. Would you like to purchase or extend your license now?</p>",
'class': 'btn-primary', 'class': 'btn-primary',
action: function () { action: function () {
var href = $('#license-link').attr('href'); window.open('http://www.ansible.com/ansible-pricing', 'storeWindow');
window.open(href, 'storeWindow');
} }
}); });
}; };
@@ -127,8 +126,7 @@ angular.module('License', ['RestServices', 'Utilities', 'FormGenerator', 'Prompt
}) })
.error(function (data, status) { .error(function (data, status) {
ProcessErrors($rootScope, data, status, form, { ProcessErrors($rootScope, data, status, form, { hdr: 'Error!',
hdr: 'Error!',
msg: 'Failed to retrieve license. GET status: ' + status msg: 'Failed to retrieve license. GET status: ' + status
}); });
}); });