Merge pull request #40 from emanuelschuetze/event-organizer

Removed unused field 'event_organizer'.

Author: emanuelschuetze

example_instance.json

@@ -13,8 +13,7 @@
           "event_name": "Konferenz 1",
           "event_description": "Dies ist eine Test-Instanz",
           "event_date": "2016-11-11",
-          "event_location": "Hamburg",
-          "event_organizer": "OpenSlides"
+          "event_location": "Hamburg"
       },
       "relationships": {
         "osversion": {

python/multiinstance/models.py

@@ -52,7 +52,6 @@ class Instance(SimpleApiObject):
     event_description = ObjectAttribute("event_description")
     event_date = ObjectAttribute("event_date")
     event_location = ObjectAttribute("event_location")
-    event_organizer = ObjectAttribute("event_organizer")
 
     projector_logo = ObjectAttribute("projector_logo")
 

roles/multiinstance-server/templates/add_configuration.sql.j2

@@ -2,6 +2,4 @@ INSERT INTO core_configstore (key, value) VALUES
   ('general_event_name', ...),
   ('general_event_description', ...),
   ('general_event_date', ...),
-  ('general_event_location', ...),
-  ('general_event_organizer', ...);
-
+  ('general_event_location', ...);

roles/openslides-add-instance/tasks/init_instance_database.yml

@@ -51,7 +51,6 @@
       - { key: 'general_event_description', value: '{{ openslides_instance_event_description }}' }
       - { key: 'general_event_date', value: '{{ openslides_instance_event_date }}' }
       - { key: 'general_event_location', value: '{{ openslides_instance_event_location }}' }
-      - { key: 'general_event_organizer', value: '{{ openslides_instance_event_organizer }}' }
 
 # - name: Activate anonymous user
 #   when: openslidesMigratedDatabase.changed

roles/openslides-add-instance/templates/add_configuration.sql.j2

@@ -3,6 +3,5 @@ INSERT INTO core_configstore (key, value) VALUES
   ('general_event_name', ...),
   ('general_event_description', ...),
   ('general_event_date', ...),
-  ('general_event_location', ...),
-  ('general_event_organizer', ...);
+  ('general_event_location', ...);