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

Jobs page cosmetic fixes. Fixed pagination/search issue causing current page # to be incorrect.

Browse Source
This commit is contained in:
chouseknecht
2013-05-19 19:05:26 -04:00
parent 6b881a58bf
commit 32573ab013
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,6 +78,7 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
scope[iterator + 'SearchParams'] = ''; scope[iterator + 'SearchParams'] = '';
scope[iterator + 'SearchParams'] += (default_order) ? '?order_by=' + escape(default_order) : ''; scope[iterator + 'SearchParams'] += (default_order) ? '?order_by=' + escape(default_order) : '';
} }
scope[iterator + 'Page'] = 0;
url += scope[iterator + 'SearchParams']; url += scope[iterator + 'SearchParams'];
url += (scope[iterator + 'PageSize']) ? '&page_size=' + scope[iterator + 'PageSize'] : ""; url += (scope[iterator + 'PageSize']) ? '&page_size=' + scope[iterator + 'PageSize'] : "";
Refresh({ scope: scope, set: set, iterator: iterator, url: url }); Refresh({ scope: scope, set: set, iterator: iterator, url: url });

8
lib/ui/static/js/lists/Jobs.js
View File

@@ -46,14 +46,14 @@ angular.module('JobsListDefinition', [])
ngClick: "editJob(\{\{ job.id \}\})", ngClick: "editJob(\{\{ job.id \}\})",
icon: 'icon-edit', icon: 'icon-edit',
class: 'btn-mini', class: 'btn-mini',
awToolTip: 'Edit job', awToolTip: 'Edit/View detail',
}, },
summary: { summary: {
title: 'Summary', title: 'Summary',
icon: 'icon-filter', icon: 'icon-filter',
ngClick: 'viewSummary()', ngClick: 'viewSummary()',
class: 'btn-success btn-mini', class: 'btn-info btn-mini',
awToolTip: 'Job summary', awToolTip: 'View host summary',
ngDisabled: "job.status == 'new'" ngDisabled: "job.status == 'new'"
}, },
events: { events: {
@@ -62,7 +62,7 @@ angular.module('JobsListDefinition', [])
mode: 'all', mode: 'all',
ngClick: 'viewEvents()', ngClick: 'viewEvents()',
class: 'btn-info btn-mini', class: 'btn-info btn-mini',
awToolTip: 'Job event detail', awToolTip: 'View events',
ngDisabled: "job.status == 'new'" ngDisabled: "job.status == 'new'"
}, },
cancel: { cancel: {