Cavemanon/cavemanon-wagtail-personalisation
Archived
7
Fork 0
Code Issues Pull Requests Activity

Forgot to solve a conflict

Browse Source
This commit is contained in:
Jasper Berghoef
2016-11-10 12:52:19 +01:00
parent f98e94ea10
commit 9d17f24e05
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/personalisation/views.py
View File

@ -34,7 +34,6 @@ def disable(request, segment_id):
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
<<<<<<< HEAD
# TODO: Make these requestable from an exsisting page (the create page.) # TODO: Make these requestable from an exsisting page (the create page.)
# This code might become obselete. # This code might become obselete.
@ -73,11 +72,9 @@ def visit_c_rule_embed(request):
return render(request, 'wagtailadmin/embeds/visit_count_rule.html', { return render(request, 'wagtailadmin/embeds/visit_count_rule.html', {
'form_fields': VisitCountRule, 'form_fields': VisitCountRule,
}) })
=======
class CreateSegmentView(CreateView): class CreateSegmentView(CreateView):
page_title = _("Add segment") page_title = _("Add segment")
form_class = SegmentForm form_class = SegmentForm
template_name = 'modeladmin/personalisation/segment/create.html' template_name = 'modeladmin/personalisation/segment/create.html'
header_icon = 'folder-open-1' header_icon = 'folder-open-1'
>>>>>>> origin/master