Dockery/Pinry
1
0
Fork 0
mirror of https://github.com/pinry/pinry.git synced 2025-11-13 16:45:41 +01:00
Code Issues Packages Projects Releases Activity

Fix: Upgrade django to 1.11 LTS

Browse Source 
New version of django fix the RuntimeError while saving wepb file.

The patch will not be applied to Django 1.8

Ref: https://www.djangoproject.com/download/#supported-versions

Ref: https://github.com/django/django/pull/10331
This commit is contained in:
winkidney
2018-08-24 07:44:28 -07:00
parent 099158b738
commit f85a1e7301
6 changed files with 169 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/api.py
View File

@@ -80,12 +80,21 @@ class ThumbnailResource(ModelResource):
class ImageResource(ModelResource):
standard = fields.ToOneField(ThumbnailResource, full=True,
attribute=lambda bundle: filter_generator_for('standard')(bundle))
thumbnail = fields.ToOneField(ThumbnailResource, full=True,
attribute=lambda bundle: filter_generator_for('thumbnail')(bundle))
square = fields.ToOneField(ThumbnailResource, full=True,
attribute=lambda bundle: filter_generator_for('square')(bundle))
standard = fields.ToOneField(
ThumbnailResource, full=True,
attribute=lambda bundle: filter_generator_for('standard')(bundle),
related_name='thumbnail',
)
thumbnail = fields.ToOneField(
ThumbnailResource, full=True,
attribute=lambda bundle: filter_generator_for('thumbnail')(bundle),
related_name='thumbnail',
)
square = fields.ToOneField(
ThumbnailResource, full=True,
attribute=lambda bundle: filter_generator_for('square')(bundle),
related_name='thumbnail',
)
class Meta:
fields = ['image', 'width', 'height']
@@ -127,8 +136,8 @@ class PinResource(ModelResource):
def dehydrate_tags(self, bundle):
return list(map(str, bundle.obj.tags.all()))
def build_filters(self, filters=None):
orm_filters = super(PinResource, self).build_filters(filters)
def build_filters(self, filters=None, ignore_bad_filters=False):
orm_filters = super(PinResource, self).build_filters(filters, ignore_bad_filters=ignore_bad_filters)
if filters and 'tag' in filters:
orm_filters['tags__name__in'] = filters['tag'].split(',')
return orm_filters