From 5702c8249eb143a81b7bed5b65f056f819ba5a20 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 26 Jun 2018 14:08:03 -0700 Subject: [PATCH] Fixes the standalone schedules list styling The list was not wrapped in a panel and the form was not showing above the list view like our other CRUD views. --- awx/ui/client/src/scheduler/scheduled-jobs.list.js | 2 +- awx/ui/client/src/scheduler/schedules.route.js | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/src/scheduler/scheduled-jobs.list.js b/awx/ui/client/src/scheduler/scheduled-jobs.list.js index 709a98bd3c..8a15b3cb92 100644 --- a/awx/ui/client/src/scheduler/scheduled-jobs.list.js +++ b/awx/ui/client/src/scheduler/scheduled-jobs.list.js @@ -11,8 +11,8 @@ export default ['i18n', function(i18n) { name: 'schedules', iterator: 'schedule', editTitle: i18n._('SCHEDULED JOBS'), + listTitle: i18n._('SCHEDULED JOBS'), hover: true, - well: false, emptyListText: i18n._('No schedules exist'), fields: { diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js index 5eb3d0f33d..a67eed3028 100644 --- a/awx/ui/client/src/scheduler/schedules.route.js +++ b/awx/ui/client/src/scheduler/schedules.route.js @@ -313,12 +313,14 @@ const jobsSchedulesRoute = { views: { '@': { templateProvider: function(ScheduleList, generateList){ - ScheduleList.well = true; + let html = generateList.build({ list: ScheduleList, - mode: 'edit', - title: false + mode: 'edit' }); + html = generateList.wrapPanel(html); + let formPlaceholder = generateList.insertFormView(); + html = formPlaceholder + html; return html; }, controller: 'schedulerListController' @@ -346,7 +348,7 @@ const jobsSchedulesEditRoute = { label: "{{breadcrumb.schedule_name}}" }, views: { - '@': { + 'form': { controller: 'schedulerEditController', templateUrl: templateUrl("scheduler/schedulerForm"), }