From df4366bdbaf7115548b481947125f4aa45f1274d Mon Sep 17 00:00:00 2001
From: Matthew Jones <mat@matburt.net>
Date: Wed, 29 Oct 2014 15:17:18 -0400
Subject: [PATCH] Finish up the job template copying -> job_template/n/launch
 switch since the UI implements this correctly now

---
 awx/main/access.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/awx/main/access.py b/awx/main/access.py
index 9511c9a1b3..04d6991708 100644
--- a/awx/main/access.py
+++ b/awx/main/access.py
@@ -980,6 +980,8 @@ class JobAccess(BaseAccess):
     def can_add(self, data):
         if not data or '_method' in data:  # So the browseable API will work?
             return True
+        if not self.user.is_superuser:
+            return False
 
         reader = TaskSerializer()
         validation_info = reader.from_file()
@@ -995,8 +997,6 @@ class JobAccess(BaseAccess):
         if validation_info.get('free_instances', 0) < 0:
             raise PermissionDenied("Host Count exceeds available instances")
 
-        if self.user.is_superuser:
-            return True
         add_data = dict(data.items())
 
         # If a job template is provided, the user should have read access to it.
@@ -1012,9 +1012,6 @@ class JobAccess(BaseAccess):
                 add_data.setdefault('credential', job_template.credential.pk)
         else:
             job_template = None
-            # Only admins can create jobs without job templates
-            if not self.user.is_superuser:
-                return False
 
         # Check that the user would be able to add a job template with the
         # same data.