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

UI Automation Assistance

Browse Source 
Added 'selected' class to search widget dropdown list to mark the active <li> element.
This commit is contained in:
Chris Houseknecht
2014-09-03 11:39:35 -04:00
parent d553a27a29
commit 4db925906e
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/ui/static/js/helpers/related-search.js
View File

@@ -30,6 +30,19 @@ angular.module('RelatedSearchHelper', ['RestServices', 'Utilities', 'RefreshRela
relatedSets = params.relatedSets, relatedSets = params.relatedSets,
form = params.form, f; form = params.form, f;
// add 'selected' class to the selected li element
function setSelectedItem(iterator, label) {
$('#' + iterator + 'SearchDropdown' + ' li').each(function() {
$(this).removeClass('selected');
var link = $(this).find('a');
if (label === link.text()) {
$(this).addClass('selected');
}
});
}
// Set default values // Set default values
function setDefaults(inIterator) { function setDefaults(inIterator) {
var iterator, f, fld, set; var iterator, f, fld, set;
@@ -75,6 +88,8 @@ angular.module('RelatedSearchHelper', ['RestServices', 'Utilities', 'RefreshRela
if (form.related[set].fields[f].searchType && form.related[set].fields[f].searchType === 'gtzero') { if (form.related[set].fields[f].searchType && form.related[set].fields[f].searchType === 'gtzero') {
scope[iterator + "InputHide"] = true; scope[iterator + "InputHide"] = true;
} }
setSelectedItem(iterator, scope[iterator + 'SearchFieldLabel']);
} }
} }
} }
@@ -119,6 +134,8 @@ angular.module('RelatedSearchHelper', ['RestServices', 'Utilities', 'RefreshRela
scope[iterator + 'SearchType'] = 'int'; scope[iterator + 'SearchType'] = 'int';
} }
setSelectedItem(iterator, label);
scope.search(iterator); scope.search(iterator);
}; };

18
awx/ui/static/js/helpers/search.js
View File

@@ -36,6 +36,19 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
sort_order = params.sort_order || '', sort_order = params.sort_order || '',
widgets, i, modifier; widgets, i, modifier;
// add 'selected' class to the selected li element
function setSelectedItem(iterator, label, modifier) {
// add 'selected' class to the selected li element
$('#' + iterator + 'SearchDropdown' + modifier + ' li').each(function() {
$(this).removeClass('selected');
var link = $(this).find('a');
if (label === link.text()) {
$(this).addClass('selected');
}
});
}
function setDefaults(widget) { function setDefaults(widget) {
// Set default values // Set default values
var f, fld, fka, modifier; var f, fld, fka, modifier;
@@ -130,6 +143,8 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
scope[iterator + 'InputHide' + modifier] = true; scope[iterator + 'InputHide' + modifier] = true;
} }
} }
setSelectedItem(iterator, scope[iterator + 'SearchFieldLabel' + modifier], modifier);
} }
if (setWidgets) { if (setWidgets) {
@@ -231,8 +246,9 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
scope[iterator + 'ShowStartBtn' + modifier] = false; scope[iterator + 'ShowStartBtn' + modifier] = false;
} }
scope.search(iterator); setSelectedItem(iterator, label, modifier);
scope.search(iterator);
}; };
scope.resetSearch = function (iterator) { scope.resetSearch = function (iterator) {