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

Refactored URLs to be more DRY, changed reverse lookups to use named url patterns.

Browse Source
This commit is contained in:
Chris Church
2013-04-27 23:19:28 -04:00
parent 48c0b1c6d5
commit 69a9916423
6 changed files with 297 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,8 +231,7 @@ class Tag(models.Model):
return unicode(self.name)
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_TagsDetail, args=(self.pk,))
return reverse('main:tags_detail', args=(self.pk,))
@classmethod
def can_user_add(cls, user, data):
@@ -275,8 +274,7 @@ class Organization(CommonModel):
projects = models.ManyToManyField('Project', blank=True, related_name='organizations')
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_OrganizationsDetail, args=(self.pk,))
return reverse('main:organizations_detail', args=(self.pk,))
@classmethod
def can_user_delete(cls, user, obj):
@@ -316,8 +314,7 @@ class Inventory(CommonModel):
organization = models.ForeignKey(Organization, null=False, related_name='inventories')
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_InventoryDetail, args=(self.pk,))
return reverse('main:inventory_detail', args=(self.pk,))
@classmethod
def _has_permission_types(cls, user, obj, allowed):
@@ -423,8 +420,7 @@ class Host(CommonModelNameNotUnique):
return rc
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_HostsDetail, args=(self.pk,))
return reverse('main:hosts_detail', args=(self.pk,))
# Use .job_host_summaries.all() to get jobs affecting this host.
# Use .job_events.all() to get events affecting this host.
@@ -465,8 +461,7 @@ class Group(CommonModelNameNotUnique):
return Inventory.can_user_read(user, obj.inventory)
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_GroupsDetail, args=(self.pk,))
return reverse('main:groups_detail', args=(self.pk,))
# FIXME: audit nullables
# FIXME: audit cascades
@@ -488,8 +483,7 @@ class VariableData(CommonModelNameNotUnique):
return '%s = %s' % (self.name, self.data)
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_VariableDetail, args=(self.pk,))
return reverse('main:variable_detail', args=(self.pk,))
@classmethod
def can_user_read(cls, user, obj):
@@ -606,8 +600,7 @@ class Credential(CommonModelNameNotUnique):
return Team.can_user_administrate(user, team_obj, data)
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_CredentialsDetail, args=(self.pk,))
return reverse('main:credentials_detail', args=(self.pk,))
class Team(CommonModel):
'''
@@ -622,8 +615,7 @@ class Team(CommonModel):
organization = models.ForeignKey('Organization', blank=False, null=True, on_delete=SET_NULL, related_name='teams')
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_TeamsDetail, args=(self.pk,))
return reverse('main:teams_detail', args=(self.pk,))
@classmethod
def can_user_administrate(cls, user, obj, data):
@@ -678,8 +670,7 @@ class Project(CommonModel):
#default_playbook = models.CharField(max_length=1024)
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_ProjectsDetail, args=(self.pk,))
return reverse('main:projects_detail', args=(self.pk,))
@classmethod
def can_user_administrate(cls, user, obj, data):
@@ -777,8 +768,7 @@ class Permission(CommonModelNameNotUnique):
))
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_PermissionsDetail, args=(self.pk,))
return reverse('main:permissions_detail', args=(self.pk,))
@classmethod
def can_user_administrate(cls, user, obj, data):
@@ -892,8 +882,7 @@ class JobTemplate(CommonModel):
return job
def get_absolute_url(self):
import lib.urls
return reverse(lib.urls.views_JobTemplateDetail, args=(self.pk,))
return reverse('main:job_templates_detail', args=(self.pk,))
@classmethod
def can_user_read(cls, user, obj):
@@ -1079,6 +1068,9 @@ class Job(CommonModel):
through='JobHostSummary',
)
def get_absolute_url(self):
return reverse('main:jobs_detail', args=(self.pk,))
@property
def celery_task(self):
try: