diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js index 5435eddcec..22d2e6f3fe 100644 --- a/awx/ui/client/src/forms/Credentials.js +++ b/awx/ui/client/src/forms/Credentials.js @@ -366,6 +366,7 @@ export default related: { permissions: { + basePath: 'credentials/:id/access_list/', type: 'collection', title: 'Permissions', iterator: 'permission', diff --git a/awx/ui/client/src/forms/Inventories.js b/awx/ui/client/src/forms/Inventories.js index b691d1a00b..6d841167a8 100644 --- a/awx/ui/client/src/forms/Inventories.js +++ b/awx/ui/client/src/forms/Inventories.js @@ -153,6 +153,7 @@ export default } }, permissions: { + basePath: 'projects/:id/access_list/', type: 'collection', title: 'Permissions', iterator: 'permission', diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js index 55d8e34f27..1d12f85734 100644 --- a/awx/ui/client/src/forms/JobTemplates.js +++ b/awx/ui/client/src/forms/JobTemplates.js @@ -292,85 +292,11 @@ export default }, related: { - schedules: { - type: 'collection', - title: 'Schedules', - iterator: 'schedule', - index: false, - open: false, - - actions: { - refresh: { - mode: 'all', - awToolTip: "Refresh the page", - ngClick: "refreshSchedules()", - actionClass: 'btn List-buttonDefault', - buttonContent: 'REFRESH', - ngHide: 'scheduleLoading == false && schedule_active_search == false && schedule_total_rows < 1' - }, - add: { - mode: 'all', - ngClick: 'addSchedule()', - awToolTip: 'Add a new schedule', - actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ADD' - } - }, - fields: { - name: { - key: true, - label: 'Name', - ngClick: "editSchedule(schedule.id)", - columnClass: "col-md-3 col-sm-3 col-xs-3" - }, - dtstart: { - label: 'First Run', - filter: "longDate", - searchable: false, - columnClass: "col-md-2 col-sm-3 hidden-xs" - }, - next_run: { - label: 'Next Run', - filter: "longDate", - searchable: false, - columnClass: "col-md-2 col-sm-3 col-xs-3" - }, - dtend: { - label: 'Final Run', - filter: "longDate", - searchable: false, - columnClass: "col-md-2 col-sm-3 hidden-xs" - } - }, - fieldActions: { - "play": { - mode: "all", - ngClick: "toggleSchedule($event, schedule.id)", - awToolTip: "{{ schedule.play_tip }}", - dataTipWatch: "schedule.play_tip", - iconClass: "{{ 'fa icon-schedule-enabled-' + schedule.enabled }}", - dataPlacement: "top" - }, - edit: { - label: 'Edit', - ngClick: "editSchedule(schedule.id)", - icon: 'icon-edit', - awToolTip: 'Edit schedule', - dataPlacement: 'top' - }, - "delete": { - label: 'Delete', - ngClick: "deleteSchedule(schedule.id)", - icon: 'icon-trash', - awToolTip: 'Delete schedule', - dataPlacement: 'top' - } - } - }, "completed_jobs": { include: "CompletedJobsList" }, permissions: { + basePath: 'job_templates/:id/access_list/', type: 'collection', title: 'Permissions', iterator: 'permission', @@ -410,10 +336,6 @@ export default iterator: 'completed_job', url: urls.jobs + '?or__status=successful&or__status=failed&or__status=error&or__status=canceled' }, - schedules: { - iterator: 'schedule', - url: urls.schedules - }, permissions: { iterator: 'permission', url: urls.access_list diff --git a/awx/ui/client/src/lists/CompletedJobs.js b/awx/ui/client/src/lists/CompletedJobs.js index a40a48b0ce..da6c1220c4 100644 --- a/awx/ui/client/src/lists/CompletedJobs.js +++ b/awx/ui/client/src/lists/CompletedJobs.js @@ -12,6 +12,7 @@ export default .value( 'CompletedJobsList', { name: 'completed_jobs', + basePath: 'job_templates/:id/jobs/?or__status=successful&or__status=failed&or__status=error&or__status=canceled', iterator: 'completed_job', editTitle: 'Completed Jobs', index: false, @@ -21,6 +22,7 @@ export default fields: { status: { label: '', + searchLabel: 'Status', columnClass: 'List-staticColumn--smallStatus', awToolTip: "{{ completed_job.status_tip }}", awTipPlacement: "right", diff --git a/awx/ui/client/src/search/getSearchHtml.service.js b/awx/ui/client/src/search/getSearchHtml.service.js index 8570237b32..12b9f47da9 100644 --- a/awx/ui/client/src/search/getSearchHtml.service.js +++ b/awx/ui/client/src/search/getSearchHtml.service.js @@ -10,6 +10,7 @@ export default ['GetBasePath', function(GetBasePath) { }).map(function(i) { delete f[i].awToolTip; delete f[i].ngClass; + delete f[i].ngClick; return {[i]: f[i]}; }).reduce(function (acc, i) { var key = Object.keys(i); diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 3385ad6e6c..0ab193f832 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -1408,7 +1408,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat - if (this.form.tabs) { + if (!_.isEmpty(this.form.related)) { var collection; html += "
"; @@ -1442,7 +1442,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += "
";//tabHolder } - if(this.form.tabs && this.mode === "edit"){ + if(!_.isEmpty(this.form.related) && this.mode === "edit"){ html += "
"; } @@ -1554,7 +1554,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += "
"; - if (collection1.generateList) { - html += GenerateList.buildHTML(collection1, { mode: 'edit' }); - } - else { - html += this.GenerateCollection({ form: this.form, related: itm }, options); - } + html += this.GenerateCollection({ form: this.form, related: itm }, options); html += "
\n"; } } @@ -1694,8 +1689,9 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += "
\n"; } var rootID = $location.$$path.split("/")[2]; - var endpoint = "/api/v1/" + collection.basePath - .replace(":id", rootID); + var endpoint = (collection.basePath) ? "/api/v1/" + + collection.basePath + .replace(":id", rootID) : ""; var tagSearch = getSearchHtml .inject(getSearchHtml.getList(collection), endpoint, itm, collection.iterator);