Revision 3ec71573 snf-cyclades-app/synnefo/ui/userdata/rest.py
b/snf-cyclades-app/synnefo/ui/userdata/rest.py | ||
---|---|---|
37 | 37 |
from django.utils import simplejson as json |
38 | 38 |
from django.core import serializers |
39 | 39 |
from django.core.urlresolvers import reverse |
40 |
from django.http import HttpResponse |
|
40 | 41 |
|
41 | 42 |
from django.core.exceptions import ValidationError, NON_FIELD_ERRORS |
42 | 43 |
|
... | ... | |
81 | 82 |
Main entry point for a request-response process. |
82 | 83 |
""" |
83 | 84 |
def view(request, *args, **kwargs): |
84 |
get_user(request, settings.ASTAKOS_URL) |
|
85 |
user = get_user(request, settings.ASTAKOS_URL) |
|
86 |
if not request.user_uniq: |
|
87 |
return HttpResponse(status=401) |
|
85 | 88 |
self = cls(*initargs, **initkwargs) |
86 | 89 |
return self.dispatch(request, *args, **kwargs) |
87 | 90 |
return view |
... | ... | |
101 | 104 |
try: |
102 | 105 |
data = json.loads(data) |
103 | 106 |
except ValueError: |
104 |
raise http.HttpResponseServerError('Invalid JSON data.')
|
|
107 |
return http.HttpResponseServerError('Invalid JSON data.')
|
|
105 | 108 |
else: |
106 |
raise http.HttpResponseServerError('Unsupported Content-Type.')
|
|
109 |
return http.HttpResponseServerError('Unsupported Content-Type.')
|
|
107 | 110 |
try: |
108 | 111 |
return getattr(self, request.method.upper())(request, data, *args, **kwargs) |
109 | 112 |
except ValidationError, e: |
... | ... | |
224 | 227 |
""" |
225 | 228 |
def queryset(self): |
226 | 229 |
return super(UserResourceView, |
227 |
self).queryset().filter(user=self.request.user) |
|
230 |
self).queryset().filter(user=self.request.user_uniq)
|
|
228 | 231 |
|
229 | 232 |
|
230 | 233 |
class UserCollectionView(CollectionView): |
... | ... | |
237 | 240 |
def POST(self, request, data, *args, **kwargs): |
238 | 241 |
instance = self.model() |
239 | 242 |
self.update_instance(instance, data, self.exclude_fields) |
240 |
instance.user = request.user |
|
243 |
instance.user = request.user_uniq
|
|
241 | 244 |
instance.full_clean() |
242 | 245 |
instance.save() |
243 | 246 |
return self.json_response(self.instance_to_dict(instance, |
Also available in: Unified diff