Merge pull request #2439 from jlmitch5/fixCopyCancel

Fix copy cancel

awx/ui/client/src/job-templates/copy/job-templates-copy.controller.js

@@ -19,7 +19,7 @@
  					jobTemplateCopyService.set(res)
             .success(function(res){
               Wait('stop');
-              $state.go('jobTemplates.edit', {id: res.id, copied: true}, {reload: true});
+              $state.go('jobTemplates.edit', {id: res.id}, {reload: true});
             });
  				})
   			.error(function(res, status){

awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js

@@ -651,22 +651,7 @@ export default
             };
 
             $scope.formCancel = function () {
-                // the form was just copied in the previous state, it's safe to destroy on cancel
-                if ($state.params.copied){
-                    var defaultUrl = GetBasePath('job_templates') + $state.params.id;
-                    Rest.setUrl(defaultUrl);
-                    Rest.destroy()
-                        .success(function(){
-                            $state.go('jobTemplates', null, {reload: true, notify:true});
-                        })
-                        .error(function(res, status){
-                            ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
-                            msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
-                        });
-                }
-                else {
-                    $state.go('jobTemplates');
-                }
+                $state.go('jobTemplates');
             };
 
             // Related set: Add button

awx/ui/client/src/job-templates/edit/job-templates-edit.route.js

@@ -14,9 +14,6 @@ export default {
     data: {
         activityStreamId: 'id'
     },
-    params: {
-        copied: null
-    },
     ncyBreadcrumb: {
         parent: 'jobTemplates',
         label: "{{name}}"