From ccb0dc9682d04cb3da91d814577ca728a6d4e01a Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 7 Jan 2015 17:02:10 +0100 Subject: [PATCH] Merge --- doc/development/api/restriction.rst | 2 +- src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/development/api/restriction.rst b/doc/development/api/restriction.rst index 55fe771d65..e29b799cdf 100644 --- a/doc/development/api/restriction.rst +++ b/doc/development/api/restriction.rst @@ -215,7 +215,7 @@ In our example, the implementation could look like this:: Control interface formsets ^^^^^^^^^^^^^^^^^^^^^^^^^^ -To make it possible for the event organizer to configure your restriction, there is a +To make it possible for the event organizer to configure your restriction, there is a 'Restrictions' page in the item configuration. This page is able to show a formset for each restriction plugin, but *you* are required to create this formset. This is why you should listen to the the ``tixlcontrol.signals.restriction_formset`` signal. diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html b/src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html index 489d2051dd..61851ceb42 100644 --- a/src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html +++ b/src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html @@ -3,5 +3,4 @@ {% load bootstrap3 %} {% block inside %} {% trans "You have to define and select propreties to be able to configure variations." %} - {% endblock %}