8

post-merge cleanups

This commit is contained in:
Paul J Stevens
2018-05-26 11:45:28 +02:00
parent 5536adc3ec
commit 9710d3b479
4 changed files with 23 additions and 57 deletions

View File

@@ -199,11 +199,11 @@ class SessionSegmentsAdapter(BaseSegmentsAdapter):
if result and segment.randomise_into_segment():
if segment.is_static and not segment.is_full:
if self.request.user.is_authenticated():
if self.request.user.is_authenticated:
segment.static_users.add(self.request.user)
additional_segments.append(segment)
elif result:
if segment.is_static and self.request.user.is_authenticated():
if segment.is_static and self.request.user.is_authenticated:
segment.excluded_users.add(self.request.user)
else:
excluded_segments += [segment]

View File

@@ -10,7 +10,7 @@ from django.contrib.staticfiles.templatetags.staticfiles import static
from django.test.client import RequestFactory
from django.utils.lru_cache import lru_cache
from django.utils.translation import ugettext_lazy as _
from wagtail.wagtailadmin.forms import WagtailAdminModelForm
from wagtail.admin.forms import WagtailAdminModelForm
SessionStore = import_module(settings.SESSION_ENGINE).SessionStore