2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

is_authenticaed is now a property

Browse source
This commit is contained in:
Laura Klünder 2017-06-18 18:53:54 +02:00
parent 613c9ee843
commit 5d41fe0e30
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/c3nav/editor/models.py
View file

@ -164,7 +164,7 @@ class ChangeSet(models.Model):
@classmethod @classmethod
def qs_for_request(cls, request): def qs_for_request(cls, request):
qs = cls.qs_base() qs = cls.qs_base()
if request.user.is_authenticated(): if request.user.is_authenticated:
qs = qs.filter(Q(author__isnull=True) | Q(author=request.user)) qs = qs.filter(Q(author__isnull=True) | Q(author=request.user))
else: else:
qs = qs.filter(author__isnull=True) qs = qs.filter(author__isnull=True)
@ -178,14 +178,14 @@ class ChangeSet(models.Model):
changeset = qs.filter(pk=changeset_pk).first() changeset = qs.filter(pk=changeset_pk).first()
if changeset is not None: if changeset is not None:
changeset.default_author = request.user changeset.default_author = request.user
if changeset.author_id is None and request.user.is_authenticated(): if changeset.author_id is None and request.user.is_authenticated:
changeset.author = request.user changeset.author = request.user
changeset.save() changeset.save()
return changeset return changeset
new_changeset = cls() new_changeset = cls()
if request.user.is_authenticated(): if request.user.is_authenticated:
changeset = qs.filter(Q(author=request.user)).order_by('-created').first() changeset = qs.filter(Q(author=request.user)).order_by('-created').first()
if changeset is not None: if changeset is not None:
request.session['changeset_pk'] = changeset.pk request.session['changeset_pk'] = changeset.pk
@ -220,7 +220,7 @@ class ChangeSet(models.Model):
self.parse_changes() self.parse_changes()
if author is None: if author is None:
author = self.default_author author = self.default_author
if author is not None and not author.is_authenticated(): if author is not None and not author.is_authenticated:
author = None author = None
if isinstance(obj, str): if isinstance(obj, str):
return ModelWrapper(self, apps.get_model('mapdata', obj), author) return ModelWrapper(self, apps.get_model('mapdata', obj), author)
@ -235,7 +235,7 @@ class ChangeSet(models.Model):
change = Change(changeset=self) change = Change(changeset=self)
change.changeset_id = self.pk change.changeset_id = self.pk
author = self.default_author if author is None else author author = self.default_author if author is None else author
if author is not None and author.is_authenticated(): if author is not None and author.is_authenticated:
change.author = author change.author = author
for name, value in kwargs.items(): for name, value in kwargs.items():
setattr(change, name, value) setattr(change, name, value)