Skip to content
This repository was archived by the owner on Feb 27, 2024. It is now read-only.

Commit fb0142f

Browse files
committed
Moar work on getting 1.5-ready.
1 parent a74b63e commit fb0142f

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ gunicorn
1414
lxml
1515
parsedatetime
1616
psycopg2
17-
pyelasticsearch
17+
pyelasticsearch==0.3
1818
Pygments
1919
python-memcached
2020
python-postmark
@@ -24,6 +24,7 @@ simplejson
2424
South
2525
Werkzeug
2626

27-
git+https://github.com/toastdriven/django-haystack.git@master#egg=django-haystack
2827
hg+https://bitbucket.org/ubernostrum/django-registration#egg=django-registration
28+
29+
git+git://github.com/toastdriven/django-haystack.git#egg=django-haystack
2930
git+git://github.com/mintchaos/typogrify.git#egg=typogrify

snipts/api.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323

2424

2525
class FavoriteValidation(Validation):
26-
def is_valid(self, bundle, request=None):
26+
def is_valid(self, bundle):
2727
errors = {}
2828
snipt = bundle.data['snipt']
2929

30-
if Favorite.objects.filter(user=request.user, snipt=snipt).count():
30+
if Favorite.objects.filter(user=bundle.request.user, snipt=snipt).count():
3131
errors['duplicate'] = 'User has already favorited this snipt.'
3232

3333
return errors
3434

3535
class UserProfileValidation(Validation):
36-
def is_valid(self, bundle, request=None):
36+
def is_valid(self, bundle):
3737
errors = {}
3838

39-
if not request.user.profile.is_pro:
39+
if not bundle.request.user.profile.is_pro:
4040
return 'You must be a Pro to change these settings.'
4141

4242
for field in bundle.data:
@@ -258,18 +258,18 @@ def dehydrate(self, bundle):
258258

259259
return bundle
260260

261-
def obj_create(self, bundle, request=None, **kwargs):
261+
def obj_create(self, bundle, **kwargs):
262262
bundle.data['tags_list'] = bundle.data.get('tags')
263263
bundle.data['tags'] = ''
264264

265265
if 'blog_post' in bundle.data:
266266
bundle = self._clean_publish_date(bundle)
267267

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)
270270

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
273273

274274
if type(bundle.data['tags']) in (str, unicode):
275275
bundle.data['tags_list'] = bundle.data['tags']
@@ -280,8 +280,8 @@ def obj_update(self, bundle, request=None, **kwargs):
280280
if 'blog_post' in bundle.data:
281281
bundle = self._clean_publish_date(bundle)
282282

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)
285285

286286
def _clean_publish_date(self, bundle):
287287
if bundle.data['blog_post'] and 'publish_date' not in bundle.data:
@@ -354,11 +354,11 @@ def dehydrate(self, bundle):
354354
bundle.obj.snipt.pk)
355355
return bundle
356356

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
359359
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)
362362

363363
def apply_authorization_limits(self, request, object_list):
364364
return object_list.filter(user=request.user)

snipts/search_indexes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ class SniptIndex(indexes.SearchIndex, indexes.Indexable):
1313
def get_model(self):
1414
return Snipt
1515

16-
def index_queryset(self):
16+
def index_queryset(self, **kwargs):
1717
"""Used when the entire index for model is updated."""
1818
return self.get_model().objects.filter(created__lte=datetime.datetime.now())

templates/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ <h3><span>Keyboard shortcuts</span></h3>
382382
{% block js %}
383383

384384
window.user = '{{ request.user.username }}';
385-
window.user_id = {{ request.user.id }};
386-
window.user_profile_id = {{ request.user.profile.id }};
385+
window.user_id = {% firstof request.user.id 'null' %};
386+
window.user_profile_id = {% firstof request.user.profile.id 'null' %};
387387

388388
{% if public %}
389389
window.pub = {{ public|lower }};

0 commit comments

Comments
 (0)