Merge branch 'fix-PRINTING_ACTIVE-ETHERPAD_ACTIVE' into 'master'

Fix errors through config options

Closes #239 and #240

See merge request protokollsystem/proto3!16

tasks.py

@@ -182,7 +182,7 @@ def parse_protocol_async_inner(protocol):
     db.session.commit()
     if protocol.source is None or len(protocol.source.strip()) == 0:
         return _make_error(protocol, "Parsing", "Protocol source is empty", "")
-    if protocol.source == config.EMPTY_ETHERPAD:
+    if config.ETHERPAD_ACTIVE and protocol.source == config.EMPTY_ETHERPAD:
         return _make_error(
             protocol, "Parsing", "The etherpad is unmodified and does not "
             "contain a protocol.", protocol.source)

views/forms.py

@@ -61,7 +61,7 @@ def get_calendar_choices(protocoltype=None):
 
 def get_printer_choices():
     choices = []
-    if config.PRINTING_PRINTERS is not None:
+    if config.PRINTING_ACTIVE and config.PRINTING_PRINTERS is not None:
         choices = list(zip(config.PRINTING_PRINTERS, config.PRINTING_PRINTERS))
     choices.insert(0, ("", "Nicht drucken"))
     return choices