External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-11 03:17:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2203 from jaredevantabor/job-template-ids

Browse Source 
Changing 'template_id' to 'id' for job templates
This commit is contained in:
Jared Tabor
2016-06-07 12:25:22 -07:00
parent 0e9819a784 f1f36f44b2
commit dc4255def0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/job-templates/edit/inventory-job-templates-edit.route.js
View File

@@ -8,10 +8,10 @@ import {templateUrl} from '../../shared/template-url/template-url.factory';
export default { export default {
name: 'inventoryJobTemplateEdit', name: 'inventoryJobTemplateEdit',
url: '/inventories/:inventory_id/job_templates/:template_id', url: '/inventories/:inventory_id/job_templates/:id',
templateUrl: templateUrl('job-templates/edit/job-templates-edit'), templateUrl: templateUrl('job-templates/edit/job-templates-edit'),
controller: 'JobTemplatesEdit', controller: 'JobTemplatesEdit',
data: { data: {
activityStreamId: 'template_id' activityStreamId: 'id'
} }
}; };

2
awx/ui/client/src/job-templates/list/job-templates-list.controller.js
View File

@@ -66,7 +66,7 @@ export default
}; };
$scope.editJobTemplate = function (id) { $scope.editJobTemplate = function (id) {
$state.transitionTo('jobTemplates.edit', {template_id: id}); $state.transitionTo('jobTemplates.edit', {id: id});
}; };
$scope.deleteJobTemplate = function (id, name) { $scope.deleteJobTemplate = function (id, name) {

2
awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
View File

@@ -72,7 +72,7 @@ export default ['$scope', '$rootScope', '$location', '$log',
}; };
$scope.editJobTemplate = function (id) { $scope.editJobTemplate = function (id) {
$state.transitionTo('jobTemplates.edit', {template_id: id}); $state.transitionTo('jobTemplates.edit', {id: id});
}; };
$scope.submitJob = function (id) { $scope.submitJob = function (id) {