SCHEDULES
diff --git a/awx/ui/client/features/output/legacy.route.js b/awx/ui/client/features/output/legacy.route.js
index 4abf991dbb..2db75d01d7 100644
--- a/awx/ui/client/features/output/legacy.route.js
+++ b/awx/ui/client/features/output/legacy.route.js
@@ -45,6 +45,27 @@ function LegacyRedirect ($stateRegistry) {
return { state: destination, params: { type: 'project', id } };
}
},
+ {
+ name: 'legacySchedulesList',
+ url: '/jobs/schedules?schedule_search',
+ redirectTo: (trans) => {
+ const {
+ schedule_search // eslint-disable-line camelcase
+ } = trans.params();
+ return { state: 'schedules', params: { schedule_search } };
+ }
+ },
+ {
+ name: 'legacySchedule',
+ url: '/jobs/schedules/:schedule_id?schedule_search',
+ redirectTo: (trans) => {
+ const {
+ schedule_id, // eslint-disable-line camelcase
+ schedule_search // eslint-disable-line camelcase
+ } = trans.params();
+ return { state: 'schedules.edit', params: { schedule_id, schedule_search } };
+ }
+ },
];
routes.forEach(state => $stateRegistry.register(state));
diff --git a/awx/ui/client/lib/components/layout/layout.partial.html b/awx/ui/client/lib/components/layout/layout.partial.html
index 45bf99f9de..9354f06dce 100644
--- a/awx/ui/client/lib/components/layout/layout.partial.html
+++ b/awx/ui/client/lib/components/layout/layout.partial.html
@@ -40,7 +40,7 @@
-
+
diff --git a/awx/ui/client/lib/components/layout/side-nav-item.directive.js b/awx/ui/client/lib/components/layout/side-nav-item.directive.js
index d4b11bf716..73074e91d1 100644
--- a/awx/ui/client/lib/components/layout/side-nav-item.directive.js
+++ b/awx/ui/client/lib/components/layout/side-nav-item.directive.js
@@ -11,7 +11,7 @@ function AtSideNavItemController ($scope, strings) {
if ($scope.name === 'portal mode') {
vm.isRoute = (current && current.indexOf('portalMode') === 0);
} else if (current && current.indexOf($scope.route) === 0) {
- if (current.indexOf('jobs.schedules') === 0 && $scope.route === 'jobs') {
+ if (current.indexOf('schedules') === 0 && $scope.route === 'jobs') {
vm.isRoute = false;
} else {
vm.isRoute = true;
diff --git a/awx/ui/client/src/scheduler/schedulerList.controller.js b/awx/ui/client/src/scheduler/schedulerList.controller.js
index 22f7ffe0de..e1546c8bc5 100644
--- a/awx/ui/client/src/scheduler/schedulerList.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerList.controller.js
@@ -101,7 +101,7 @@ export default [
}
buildTooltips(itm);
- if (!$state.is('jobs.schedules')){
+ if (!$state.is('schedules')){
if($state.current.name.endsWith('.add')) {
itm.linkToDetails = `^.edit({schedule_id:schedule.id})`;
}
@@ -157,8 +157,8 @@ export default [
};
$scope.editSchedule = function(schedule) {
- if ($state.is('jobs.schedules')){
- $state.go('jobs.schedules.edit', {schedule_id: schedule.id});
+ if ($state.is('schedules')){
+ $state.go('schedules.edit', {schedule_id: schedule.id});
}
else {
if($state.current.name.endsWith('.add')) {
diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js
index 965b42f97d..5eb3d0f33d 100644
--- a/awx/ui/client/src/scheduler/schedules.route.js
+++ b/awx/ui/client/src/scheduler/schedules.route.js
@@ -269,7 +269,7 @@ const projectsSchedulesEditRoute = {
const jobsSchedulesRoute = {
searchPrefix: 'schedule',
- name: 'jobs.schedules',
+ name: 'schedules',
route: '/schedules',
params: {
schedule_search: {
@@ -284,7 +284,6 @@ const jobsSchedulesRoute = {
activityStream: false,
},
ncyBreadcrumb: {
- parent: 'jobs',
label: N_('SCHEDULES')
},
resolve: {
@@ -312,8 +311,9 @@ const jobsSchedulesRoute = {
}]
},
views: {
- 'schedulesList@jobs': {
+ '@': {
templateProvider: function(ScheduleList, generateList){
+ ScheduleList.well = true;
let html = generateList.build({
list: ScheduleList,
mode: 'edit',
@@ -339,14 +339,14 @@ const parentResolve = {
};
const jobsSchedulesEditRoute = {
- name: 'jobs.schedules.edit',
+ name: 'schedules.edit',
route: '/:schedule_id',
ncyBreadcrumb: {
- parent: 'jobs.schedules',
+ parent: 'schedules',
label: "{{breadcrumb.schedule_name}}"
},
views: {
- 'scheduler@jobs': {
+ '@': {
controller: 'schedulerEditController',
templateUrl: templateUrl("scheduler/schedulerForm"),
}