Compare commits
3 Commits
0.12.1
...
feature/mo
Author | SHA1 | Date | |
---|---|---|---|
4bbac1d542 | |||
d9ef74c8f2 | |||
1e69d929aa |
4
CHANGES
4
CHANGES
@ -1,3 +1,7 @@
|
||||
0.12.0
|
||||
==================
|
||||
- Fix Django version classifier in setup.py
|
||||
|
||||
0.12.0
|
||||
==================
|
||||
- Merged forks of Torchbox and Praekelt
|
||||
|
@ -62,10 +62,10 @@ author = 'Lab Digital BV'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '0.12.0'
|
||||
version = '0.12.1'
|
||||
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.12.0'
|
||||
release = '0.12.1'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
@ -1,5 +1,5 @@
|
||||
[bumpversion]
|
||||
current_version = 0.12.0
|
||||
current_version = 0.12.1
|
||||
commit = true
|
||||
tag = true
|
||||
tag_name = {new_version}
|
||||
|
2
setup.py
2
setup.py
@ -35,7 +35,7 @@ with open('README.rst') as fh:
|
||||
|
||||
setup(
|
||||
name='wagtail-personalisation',
|
||||
version='0.12.0',
|
||||
version='0.12.1',
|
||||
description='A Wagtail add-on for showing personalized content',
|
||||
author='Lab Digital BV and others',
|
||||
author_email='opensource@labdigital.nl',
|
||||
|
@ -196,8 +196,7 @@ class SessionSegmentsAdapter(BaseSegmentsAdapter):
|
||||
for segment in enabled_segments:
|
||||
if segment.is_static and segment.static_users.filter(id=self.request.user.id).exists():
|
||||
additional_segments.append(segment)
|
||||
elif (segment.excluded_users.filter(id=self.request.user.id).exists() or
|
||||
segment in excluded_segments):
|
||||
elif (segment.excluded_users.filter(id=self.request.user.id).exists() or segment in excluded_segments):
|
||||
continue
|
||||
elif not segment.is_static or not segment.is_full:
|
||||
segment_rules = []
|
||||
|
@ -1,17 +1,6 @@
|
||||
{% extends "modeladmin/index.html" %}
|
||||
{% load i18n l10n staticfiles modeladmin_tags %}
|
||||
|
||||
{% block titletag %}{{ view.get_meta_title }}{% endblock %}
|
||||
|
||||
{% block css %}
|
||||
{{ block.super }}
|
||||
{{ view.media.css }}
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_js %}
|
||||
{{ view.media.js }}
|
||||
{% endblock %}
|
||||
|
||||
{% block header %}
|
||||
<header class="nice-padding hasform">
|
||||
<div class="row">
|
||||
|
@ -1,5 +1,5 @@
|
||||
{% extends "modeladmin/wagtail_personalisation/segment/base.html" %}
|
||||
{% load i18n l10n staticfiles modeladmin_tags wagtail_personalisation_filters %}
|
||||
{% load i18n l10n modeladmin_tags wagtail_personalisation_filters %}
|
||||
|
||||
{% block toggle_view %}to List {% endblock%}
|
||||
|
||||
|
@ -1,5 +1,3 @@
|
||||
{% extends "modeladmin/wagtail_personalisation/segment/base.html" %}
|
||||
{% load i18n l10n staticfiles modeladmin_tags wagtail_personalisation_filters %}
|
||||
|
||||
{% block toggle_view %}to Dashboard {% endblock%}
|
||||
|
||||
|
Reference in New Issue
Block a user