Skip to content

Fix a proxy model bug related to ad-free #4390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 18, 2018
Merged

Fix a proxy model bug related to ad-free #4390

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
531b1d8
Fix a proxy model bug related to ad-free
davidfischer Jul 17, 2018
03e4bd8
Correctly initialize and test APIProject data
davidfischer Jul 17, 2018
efc3fb0
Updates based on feedback
davidfischer Jul 18, 2018
cd56a9c
Equals -> equal
davidfischer Jul 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions readthedocs/projects/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,7 @@ class Meta:

def __init__(self, *args, **kwargs):
self.features = kwargs.pop('features', [])
self.ad_free = (not kwargs.pop('show_advertising', True))
# These fields only exist on the API return, not on the model, so we'll
# remove them to avoid throwing exceptions due to unexpected fields
for key in ['users', 'resource_uri', 'absolute_url', 'downloads',
Expand All @@ -900,6 +901,11 @@ def save(self, *args, **kwargs):
def has_feature(self, feature_id):
return feature_id in self.features

@property
def show_advertising(self):
"""Whether this project is ad-free (don't access the database)"""
return not self.ad_free


@python_2_unicode_compatible
class ImportedFile(models.Model):
Expand Down