From 32573ab013bd0854742c58969ecb9d1f9f6d748d Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Sun, 19 May 2013 19:05:26 -0400 Subject: [PATCH] Jobs page cosmetic fixes. Fixed pagination/search issue causing current page # to be incorrect. --- lib/ui/static/js/helpers/search.js | 1 + lib/ui/static/js/lists/Jobs.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/ui/static/js/helpers/search.js b/lib/ui/static/js/helpers/search.js index 84bc8968bf..50e4935b0c 100644 --- a/lib/ui/static/js/helpers/search.js +++ b/lib/ui/static/js/helpers/search.js @@ -78,6 +78,7 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper']) scope[iterator + 'SearchParams'] = ''; scope[iterator + 'SearchParams'] += (default_order) ? '?order_by=' + escape(default_order) : ''; } + scope[iterator + 'Page'] = 0; url += scope[iterator + 'SearchParams']; url += (scope[iterator + 'PageSize']) ? '&page_size=' + scope[iterator + 'PageSize'] : ""; Refresh({ scope: scope, set: set, iterator: iterator, url: url }); diff --git a/lib/ui/static/js/lists/Jobs.js b/lib/ui/static/js/lists/Jobs.js index d45176523d..d5be9f6fd3 100644 --- a/lib/ui/static/js/lists/Jobs.js +++ b/lib/ui/static/js/lists/Jobs.js @@ -46,14 +46,14 @@ angular.module('JobsListDefinition', []) ngClick: "editJob(\{\{ job.id \}\})", icon: 'icon-edit', class: 'btn-mini', - awToolTip: 'Edit job', + awToolTip: 'Edit/View detail', }, summary: { title: 'Summary', icon: 'icon-filter', ngClick: 'viewSummary()', - class: 'btn-success btn-mini', - awToolTip: 'Job summary', + class: 'btn-info btn-mini', + awToolTip: 'View host summary', ngDisabled: "job.status == 'new'" }, events: { @@ -62,7 +62,7 @@ angular.module('JobsListDefinition', []) mode: 'all', ngClick: 'viewEvents()', class: 'btn-info btn-mini', - awToolTip: 'Job event detail', + awToolTip: 'View events', ngDisabled: "job.status == 'new'" }, cancel: {