diff --git a/CHANGELOG b/CHANGELOG index d22c56df9..3393121b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,6 +38,7 @@ Other: for generic Django REST Framework views in OpenSlides apps. - Removed most of the Django views and templates. - Removed Django error pages. +- Added page for legal notes. - Refactored projector API using metaclasses now. - Renamed SignalConnectMetaClass classmethod get_all_objects to get_all (private API). diff --git a/openslides/core/config.py b/openslides/core/config.py index 4f9f2f2c8..22752ee42 100644 --- a/openslides/core/config.py +++ b/openslides/core/config.py @@ -6,6 +6,7 @@ from .models import ConfigStore INPUT_TYPE_MAPPING = { 'string': str, + 'text': str, 'integer': int, 'boolean': bool, 'choice': str} diff --git a/openslides/core/signals.py b/openslides/core/signals.py index e1dd700a6..f920d63ff 100644 --- a/openslides/core/signals.py +++ b/openslides/core/signals.py @@ -55,7 +55,6 @@ def setup_general_config(sender, **kwargs): group=ugettext_lazy('General'), subgroup=ugettext_lazy('Event')) - # TODO: Check whether this variable is ever used. yield ConfigVariable( name='general_event_organizer', default_value='', @@ -64,6 +63,15 @@ def setup_general_config(sender, **kwargs): group=ugettext_lazy('General'), subgroup=ugettext_lazy('Event')) + yield ConfigVariable( + name='general_event_legal_notes', + default_value='', + input_type='text', + label=ugettext_lazy('Legal notes'), + weight=132, + group=ugettext_lazy('General'), + subgroup=ugettext_lazy('Event')) + # General System yield ConfigVariable( diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js index 50c88ed73..f1576393d 100644 --- a/openslides/core/static/js/core/site.js +++ b/openslides/core/static/js/core/site.js @@ -321,6 +321,7 @@ angular.module('OpenSlidesApp.core.site', [ function getHtmlType(type) { return { string: 'text', + text: 'textarea', integer: 'number', boolean: 'checkbox', choice: 'choice', diff --git a/openslides/core/static/templates/config-form-field.html b/openslides/core/static/templates/config-form-field.html index c49fdc249..c079fec21 100644 --- a/openslides/core/static/templates/config-form-field.html +++ b/openslides/core/static/templates/config-form-field.html @@ -2,8 +2,10 @@
- + + +