fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2026-01-06 08:54:12 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Changed to slug urls for mix children

Browse Source
This commit is contained in:
Fergal Moran
2013-04-23 12:12:08 +01:00
parent aacaaccf46
commit 520681837c
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dss/settings.py
View File

@@ -126,7 +126,6 @@ AUTHENTICATION_BACKENDS = global_settings.AUTHENTICATION_BACKENDS + (
MIDDLEWARE_CLASSES = (
'django.middleware.gzip.GZipMiddleware',
'htmlmin.middleware.HtmlMinifyMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',

18
spa/api/v1/MixResource.py
View File

@@ -22,17 +22,13 @@ class MixResource(BackboneCompatibleResource):
class Meta:
queryset = Mix.objects.filter(is_active=True)
always_return_data = True
detail_uri_name = 'slug'
excludes = ['download_url', 'is_active', 'local_file', 'upload_date']
filtering = {
'comments': ALL_WITH_RELATIONS
}
authorization = Authorization()
def prepend_urls(self):
return [
url(r"^(?P<resource_name>%s)/(?P<slug>[\w\d_.-]+)/$" % self._meta.resource_name, self.wrap_view('dispatch_detail'), name="api_dispatch_detail"),
]
def _parseGenreList(self, genres):
#for magic..
ret = []
@@ -51,12 +47,11 @@ class MixResource(BackboneCompatibleResource):
bundle.obj.genres = genre_list
bundle.obj.save()
def override_urls(self):
def prepend_urls(self):
return [
url(r"^(?P<resource_name>%s)/(?P<pk>\w[\w/-]*)/comments%s$" % (self._meta.resource_name, trailing_slash()),
self.wrap_view('get_comments'), name="api_get_comments"),
url(r"^(?P<resource_name>%s)/(?P<pk>\w[\w/-]*)/activity%s$" % (self._meta.resource_name, trailing_slash()),
self.wrap_view('get_activity'), name="api_get_activity"),
url(r"^(?P<resource_name>%s)/(?P<slug>[\w\d_.-]+)/$" % self._meta.resource_name, self.wrap_view('dispatch_detail'), name="api_dispatch_detail"),
url(r"^(?P<resource_name>%s)/(?P<slug>\w[\w/-]*)/comments%s$" % (self._meta.resource_name, trailing_slash()), self.wrap_view('get_comments'), name="api_get_comments"),
url(r"^(?P<resource_name>%s)/(?P<slug>\w[\w/-]*)/activity%s$" % (self._meta.resource_name, trailing_slash()), self.wrap_view('get_activity'), name="api_get_activity"),
]
def get_comments(self, request, **kwargs):
@@ -71,7 +66,8 @@ class MixResource(BackboneCompatibleResource):
def get_activity(self, request, **kwargs):
try:
obj = self.cached_obj_get(request=request, **self.remove_api_resource_names(kwargs))
basic_bundle = self.build_bundle(request=request)
obj = self.cached_obj_get(bundle=basic_bundle, **self.remove_api_resource_names(kwargs))
except ObjectDoesNotExist:
return HttpGone()

2
spa/templates.py
View File

@@ -10,7 +10,7 @@ __author__ = 'fergalm'
@not_minified_response
def get_template(request, template_name):
#Temporary hack here to create user profiles for zombie users
if request.user.is_authenticated():
if request.user.is_authenticated() and request.user.get_profile() is None:
zm, created = UserProfile.objects.get_or_create(user=request.user)
zm.save()
print "Created user %s" % zm