23
23
24
24
25
25
class FavoriteValidation (Validation ):
26
- def is_valid (self , bundle , request = None ):
26
+ def is_valid (self , bundle ):
27
27
errors = {}
28
28
snipt = bundle .data ['snipt' ]
29
29
30
- if Favorite .objects .filter (user = request .user , snipt = snipt ).count ():
30
+ if Favorite .objects .filter (user = bundle . request .user , snipt = snipt ).count ():
31
31
errors ['duplicate' ] = 'User has already favorited this snipt.'
32
32
33
33
return errors
34
34
35
35
class UserProfileValidation (Validation ):
36
- def is_valid (self , bundle , request = None ):
36
+ def is_valid (self , bundle ):
37
37
errors = {}
38
38
39
- if not request .user .profile .is_pro :
39
+ if not bundle . request .user .profile .is_pro :
40
40
return 'You must be a Pro to change these settings.'
41
41
42
42
for field in bundle .data :
@@ -258,18 +258,18 @@ def dehydrate(self, bundle):
258
258
259
259
return bundle
260
260
261
- def obj_create (self , bundle , request = None , ** kwargs ):
261
+ def obj_create (self , bundle , ** kwargs ):
262
262
bundle .data ['tags_list' ] = bundle .data .get ('tags' )
263
263
bundle .data ['tags' ] = ''
264
264
265
265
if 'blog_post' in bundle .data :
266
266
bundle = self ._clean_publish_date (bundle )
267
267
268
- return super (PrivateSniptResource , self ).obj_create (bundle , request ,
269
- user = request .user , ** kwargs )
268
+ return super (PrivateSniptResource , self ).obj_create (bundle ,
269
+ user = bundle . request .user , ** kwargs )
270
270
271
- def obj_update (self , bundle , request = None , ** kwargs ):
272
- bundle .data ['user' ] = request .user
271
+ def obj_update (self , bundle , ** kwargs ):
272
+ bundle .data ['user' ] = bundle . request .user
273
273
274
274
if type (bundle .data ['tags' ]) in (str , unicode ):
275
275
bundle .data ['tags_list' ] = bundle .data ['tags' ]
@@ -280,8 +280,8 @@ def obj_update(self, bundle, request=None, **kwargs):
280
280
if 'blog_post' in bundle .data :
281
281
bundle = self ._clean_publish_date (bundle )
282
282
283
- return super (PrivateSniptResource , self ).obj_update (bundle , request ,
284
- user = request .user , ** kwargs )
283
+ return super (PrivateSniptResource , self ).obj_update (bundle ,
284
+ user = bundle . request .user , ** kwargs )
285
285
286
286
def _clean_publish_date (self , bundle ):
287
287
if bundle .data ['blog_post' ] and 'publish_date' not in bundle .data :
@@ -354,11 +354,11 @@ def dehydrate(self, bundle):
354
354
bundle .obj .snipt .pk )
355
355
return bundle
356
356
357
- def obj_create (self , bundle , request = None , ** kwargs ):
358
- bundle .data ['user' ] = request .user
357
+ def obj_create (self , bundle , ** kwargs ):
358
+ bundle .data ['user' ] = bundle . request .user
359
359
bundle .data ['snipt' ] = Snipt .objects .get (pk = bundle .data ['snipt' ])
360
- return super (PrivateFavoriteResource , self ).obj_create (bundle , request ,
361
- user = request .user , ** kwargs )
360
+ return super (PrivateFavoriteResource , self ).obj_create (bundle ,
361
+ user = bundle . request .user , ** kwargs )
362
362
363
363
def apply_authorization_limits (self , request , object_list ):
364
364
return object_list .filter (user = request .user )
0 commit comments