From f1f36f44b247abc991c549828443e6e9621721c1 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Tue, 7 Jun 2016 11:22:41 -0700
Subject: [PATCH] Changing 'template_id' to 'id' for job templates

which was recently changed for bread crumb names
---
 .../job-templates/edit/inventory-job-templates-edit.route.js  | 4 ++--
 .../src/job-templates/list/job-templates-list.controller.js   | 2 +-
 .../controllers/organizations-job-templates.controller.js     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/job-templates/edit/inventory-job-templates-edit.route.js b/awx/ui/client/src/job-templates/edit/inventory-job-templates-edit.route.js
index a0b383c999..3e44b7294d 100644
--- a/awx/ui/client/src/job-templates/edit/inventory-job-templates-edit.route.js
+++ b/awx/ui/client/src/job-templates/edit/inventory-job-templates-edit.route.js
@@ -8,10 +8,10 @@ import {templateUrl} from '../../shared/template-url/template-url.factory';
 
 export default {
     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'),
     controller: 'JobTemplatesEdit',
     data: {
-        activityStreamId: 'template_id'
+        activityStreamId: 'id'
     }
 };
diff --git a/awx/ui/client/src/job-templates/list/job-templates-list.controller.js b/awx/ui/client/src/job-templates/list/job-templates-list.controller.js
index 366f89ddf3..fa3a422f80 100644
--- a/awx/ui/client/src/job-templates/list/job-templates-list.controller.js
+++ b/awx/ui/client/src/job-templates/list/job-templates-list.controller.js
@@ -66,7 +66,7 @@ export default
             };
 
             $scope.editJobTemplate = function (id) {
-                $state.transitionTo('jobTemplates.edit', {template_id: id});
+                $state.transitionTo('jobTemplates.edit', {id: id});
             };
 
             $scope.deleteJobTemplate = function (id, name) {
diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
index 7f13f997b5..1145b0b906 100644
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
@@ -72,7 +72,7 @@ export default ['$scope', '$rootScope', '$location', '$log',
         };
 
         $scope.editJobTemplate = function (id) {
-            $state.transitionTo('jobTemplates.edit', {template_id: id});
+            $state.transitionTo('jobTemplates.edit', {id: id});
         };
 
         $scope.submitJob = function (id) {