External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-17 11:10:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Latest UI changs. First iteration on Jobs page.

Browse Source
This commit is contained in:
chouseknecht
2013-05-19 15:05:03 -04:00
parent 14bc3c02f8
commit f409db7778
21 changed files with 229 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ui/static/js/helpers/paginate.js
View File

@@ -20,7 +20,7 @@ angular.module('PaginateHelper', ['RefreshHelper'])
var scope = params.scope;
var list = params.list;
var defaultUrl = params.url;
var url = params.url;
var mode = (params.mode) ? params.mode : null;
scope[list.iterator + 'Page'] = 0;
@@ -45,7 +45,8 @@ angular.module('PaginateHelper', ['RefreshHelper'])
scope.changePageSize = function(set, iterator) {
// Called when a new page size is selected
scope[iterator + 'Page'] = 0;
Refresh({ scope: scope, set: set, iterator: iterator, url: defaultUrl });
url += (scope[iterator + 'SearchParams']) ? scope[iterator + 'SearchParams'] : '';
Refresh({ scope: scope, set: set, iterator: iterator, url: url });
}
}
}]);

7
lib/ui/static/js/helpers/refresh.js
View File

@@ -22,12 +22,9 @@ angular.module('RefreshHelper', ['RestServices', 'Utilities'])
var set = params.set;
var iterator = params.iterator;
var url = params.url;
url.replace(/page_size\=\d+/,''); //stop repeatedly appending page_size
url += scope[iterator + 'SearchParams'];
Rest.setUrl(url);
Rest.get({ params: { page_size: scope[iterator + 'PageSize'] }})
Rest.get()
.success( function(data, status, headers, config) {
scope[iterator + 'NextUrl'] = data.next;
scope[iterator + 'PrevUrl'] = data.previous;

4
lib/ui/static/js/helpers/search.js
View File

@@ -30,7 +30,7 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
// Set default values
for (fld in list.fields) {
if (list.fields[fld].key) {
default_order = fld;
default_order = (list.fields[fld].desc) ? '-' + fld : fld;
scope[iterator + 'SearchField'] = fld
scope[iterator + 'SearchFieldLabel'] = list.fields[fld].label;
break;
@@ -78,6 +78,8 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
scope[iterator + 'SearchParams'] = '';
scope[iterator + 'SearchParams'] += (default_order) ? '?order_by=' + escape(default_order) : '';
}
url += scope[iterator + 'SearchParams'];
url += (scope[iterator + 'PageSize']) ? '&page_size=' + scope[iterator + 'PageSize'] : "";
Refresh({ scope: scope, set: set, iterator: iterator, url: url });
}
}