From 3113ae584da7d0d358fd382d85dbbfec492f8d07 Mon Sep 17 00:00:00 2001 From: Leigh Date: Fri, 10 Jun 2016 10:08:55 -0400 Subject: [PATCH] fix edit action in Jobs > Schedules tab view, resolves #2258 (#2292) --- awx/ui/client/src/helpers/Schedules.js | 10 ++++++++++ awx/ui/client/src/lists/ScheduledJobs.js | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/helpers/Schedules.js b/awx/ui/client/src/helpers/Schedules.js index 7a2af6a450..b7bf70c833 100644 --- a/awx/ui/client/src/helpers/Schedules.js +++ b/awx/ui/client/src/helpers/Schedules.js @@ -533,6 +533,16 @@ export default if ($state.includes('inventoryManage')){ $state.go('inventoryManage.schedules.edit', {schedule_id: id}); } + else if ($state.current.name === 'jobs'){ + // id === schedule object in this case + var stateDictionary = { + // type: stateName + job: 'jobTemplateSchedules.edit', + system_job: 'managementJobSchedules.edit', + project_update: 'projectSchedules.edit', + }; + $state.go(stateDictionary[id.type], {schedule_id: id.id, id: id.summary_fields.unified_job_template.id}); + } else{ var base = $state.current.name.split(".")[0]; $state.go(base + ".edit", {schedule_id: id}); diff --git a/awx/ui/client/src/lists/ScheduledJobs.js b/awx/ui/client/src/lists/ScheduledJobs.js index b2980e187c..1be131b6ca 100644 --- a/awx/ui/client/src/lists/ScheduledJobs.js +++ b/awx/ui/client/src/lists/ScheduledJobs.js @@ -33,7 +33,7 @@ export default columnClass: 'col-lg-4 col-md-5 col-sm-5 col-xs-7 List-staticColumnAdjacent', sourceModel: 'unified_job_template', sourceField: 'name', - ngClick: "editSchedule(schedule.id)", + ngClick: "editSchedule(schedule)", awToolTip: "{{ schedule.nameTip | sanitize}}", dataPlacement: "top", defaultSearchField: true @@ -72,7 +72,7 @@ export default columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-5', "edit": { mode: "all", - ngClick: "editSchedule(schedule.id)", + ngClick: "editSchedule(schedule)", awToolTip: "Edit the schedule", dataPlacement: "top" },