Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Dockerfile

@@ -8,7 +8,7 @@ ENV FLASK_APP=nopaque.py
 ENV LANG=C.UTF-8
 
 
-EXPOSE 8000
+EXPOSE 5000
 
 
 RUN apt-get update \
@@ -34,9 +34,6 @@ RUN python -m venv venv \
  && mkdir logs
 
 
-VOLUME ["/home/nopaque/logs", "/home/nopaque/migrations"]
-
-
 COPY ["docker-entrypoint.sh", "/usr/local/bin/"]
 
 

app/templates/macros/materialize.html.j2

@@ -1,52 +1,60 @@
 {% macro render_field(field) %}
-  {% if field.type == 'BooleanField' %}
-    {{ render_boolean_field(field, *args, **kwargs) }}
-  {% elif field.type == 'SubmitField' %}
-    {{ render_submit_field(field, *args, **kwargs) }}
-  {% elif field.type in ['FileField', 'MultipleFileField'] %}
-    {{ render_file_field(field, *args, **kwargs) }}
-  {% elif field.type in ['IntegerField', 'PasswordField', 'SelectField', 'StringField'] %}
-    {{ render_generic_field(field, *args, **kwargs) }}
-  {% endif %}
-{% endmacro %}
-
-{% macro render_boolean_field(field) %}
-<div class="switch">
-  {% if 'material_icon' in kwargs %}
-    <i class="material-icons prefix">{{ kwargs.pop('material_icon') }}</i>
-  {% endif %}
-  <label>
-    {{ field.label.text }}
-    {{ field() }}
-    <span class="lever"></span>
-  </label>
-  {% for error in field.errors %}
-    <span class="helper-text red-text">{{ error }}</span>
-  {% endfor %}
-</div>
-{% endmacro %}
-
-{% macro render_file_field(field) %}
-<div class="file-field input-field">
-  <div class="btn">
-    <span>{{ field.label.text }}</span>
-    {{ field(**kwargs) }}
-  </div>
-  <div class="file-path-wrapper">
-    <input class="file-path validate" type="text">
-  </div>
-</div>
-{% endmacro %}
-
-{% macro render_generic_field(field) %}
-  {% if field.type == 'IntegerField' %}
-    {% set tmp = kwargs.update({'type': 'number'}) %}
+  {% if field.flags.required %}
     {% if 'class_' in kwargs and 'validate' not in kwargs['class_'] %}
       {% set tmp = kwargs.update({'class_': kwargs['class_'] + ' validate'}) %}
     {% else %}
       {% set tmp = kwargs.update({'class_': 'validate'}) %}
     {% endif %}
   {% endif %}
+
+  {% if field.type == 'BooleanField' %}
+    {{ render_boolean_field(field, *args, **kwargs) }}
+  {% elif field.type == 'IntegerField' %}
+    {% set tmp = kwargs.update({'type': 'number'}) %}
+    {% if 'class_' in kwargs and 'validate' not in kwargs['class_'] %}
+      {% set tmp = kwargs.update({'class_': kwargs['class_'] + ' validate'}) %}
+    {% else %}
+      {% set tmp = kwargs.update({'class_': 'validate'}) %}
+    {% endif %}
+    {{ render_generic_field(field, *args, **kwargs) }}
+  {% elif field.type == 'SubmitField' %}
+    {{ render_submit_field(field, *args, **kwargs) }}
+  {% elif field.type in ['FileField', 'MultipleFileField'] %}
+    {{ render_file_field(field, *args, **kwargs) }}
+  {% elif field.type in ['PasswordField', 'SelectField', 'StringField'] %}
+    {{ render_generic_field(field, *args, **kwargs) }}
+  {% endif %}
+{% endmacro %}
+
+{% macro render_boolean_field(field) %}
+  <div class="switch">
+    {% if 'material_icon' in kwargs %}
+      <i class="material-icons prefix">{{ kwargs.pop('material_icon') }}</i>
+    {% endif %}
+    <label>
+      {{ field.label.text }}
+      {{ field() }}
+      <span class="lever"></span>
+    </label>
+    {% for error in field.errors %}
+      <span class="helper-text red-text">{{ error }}</span>
+    {% endfor %}
+  </div>
+{% endmacro %}
+
+{% macro render_file_field(field) %}
+  <div class="file-field input-field">
+    <div class="btn">
+      <span>{{ field.label.text }}</span>
+      {{ field(**kwargs) }}
+    </div>
+    <div class="file-path-wrapper">
+      <input class="file-path validate" type="text">
+    </div>
+  </div>
+{% endmacro %}
+
+{% macro render_generic_field(field) %}
   <div class="input-field">
     {% if 'material_icon' in kwargs %}
       <i class="material-icons prefix">{{ kwargs.pop('material_icon') }}</i>
@@ -60,10 +68,10 @@
 {% endmacro %}
 
 {% macro render_submit_field(field) %}
-<button class="btn waves-effect waves-light" id="{{ field.id }}" name="{{ field.name }}" type="submit" value="{{ field.label.text }}">
-  {{ field.label.text }}
-  {% if 'material_icon' in kwargs %}
-    <i class="material-icons right">{{ kwargs.pop('material_icon') }}</i>
-  {% endif %}
-</button>
+  <button class="btn waves-effect waves-light" id="{{ field.id }}" name="{{ field.name }}" type="submit" value="{{ field.label.text }}">
+    {{ field.label.text }}
+    {% if 'material_icon' in kwargs %}
+      <i class="material-icons right">{{ kwargs.pop('material_icon') }}</i>
+    {% endif %}
+  </button>
 {% endmacro %}