shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 05:25:29 +03:00
Code Releases Activity

Make projects deleteable.

Browse Source
This commit is contained in:
Michael DeHaan 2013-03-31 21:18:16 -04:00
parent 33ab8ff1ab
commit 3b97dced59
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/main/models/__init__.py
View File

@ -541,7 +541,9 @@ class Project(CommonModel):
# FIXME: add this too # FIXME: add this too
return False return False
@classmethod
def can_user_delete(cls, user, obj):
return cls.can_user_administrate(user, obj)
class Permission(CommonModelNameNotUnique): class Permission(CommonModelNameNotUnique):
@ -610,11 +612,8 @@ class LaunchJob(CommonModel):
from lib.main.tasks import run_launch_job from lib.main.tasks import run_launch_job
launch_job_status = self.launch_job_statuses.create(name='Launch Job Status %s' % now().isoformat()) launch_job_status = self.launch_job_statuses.create(name='Launch Job Status %s' % now().isoformat())
task_result = run_launch_job.delay(launch_job_status.pk) task_result = run_launch_job.delay(launch_job_status.pk)
try: launch_job_status.celery_task = TaskMeta.objects.get(task_id=task_result.task_id)
launch_job_status.celery_task = TaskMeta.objects.get(task_id=task_result.task_id) launch_job_status.save()
launch_job_status.save()
except TaskMeta.DoesNotExist:
pass
return launch_job_status return launch_job_status
# project has one default playbook but really should have a list of playbooks and flags ... # project has one default playbook but really should have a list of playbooks and flags ...