Added settings override fields to article.

frontend/app/components/article/article.vue

@@ -44,7 +44,7 @@
 
 <template>
   <v-container>
-    <v-card v-if="store.article != null && store.articleEdit != null">
+    <v-card v-if="store.article != null && store.articleEdit != null && store.settings != null">
       <v-card-title>
         <v-row style="padding-top: 10px">
           <v-text-field
@@ -126,15 +126,15 @@
             </v-row>
 
             <v-row no-gutters>
-              <v-col cols="5">
-                Herkunft:
-              </v-col>
-              <v-col>
-                {{ originToString(store.article.origin) }}
-              </v-col>
+              <v-select
+                  v-model="store.articleEdit.origin"
+                  :items="store.origins"
+                  label="Herkunft"
+                  :readonly="!edit"
+              ></v-select>
             </v-row>
 
-            <v-row>
+            <v-row no-gutters>
               <v-select
                   v-model="store.articleEdit.default_unit"
                   :items="store.units"
@@ -142,42 +142,84 @@
                   :readonly="!edit"
               ></v-select>
             </v-row>
+
+            <v-row no-gutters>
+              <v-text-field
+                  v-model.trim="store.articleEdit.bio_origin"
+                  label="BIO Hinweis Text"
+                  :hint="store.settings.bio"
+                  persistent-placeholder
+                  persistent-hint
+              />
+            </v-row>
+
+            <v-row no-gutters>
+              <v-text-field
+                  v-model.trim="store.articleEdit.mhd"
+                  label="MHD Text"
+                  :hint="store.settings.mhd"
+                  persistent-placeholder
+                  persistent-hint
+              />
+            </v-row>
           </v-col>
 
           <v-col cols="5" style="padding: 5px;">
-            <v-textarea
-                v-model.trim="store.articleEdit.description"
-                :tile=true
-                label="Beschreibung"
-                counter
-                :persistentCounter=true
-                rows="6"
-                no-resize
-                :readonly="!edit"
-                persistent-placeholder
-            >
-              <template v-slot:counter="{ counter }">
-                <span>{{ counter }} von {{ store.ingredientsMaxChars  }} Zeichen.</span>
-              </template>
-            </v-textarea>
+            <v-row no-gutters>
+              <v-text-field
+                  v-model.trim="store.articleEdit.bio_info"
+                  label="BIO Hinweis Text"
+                  :hint="store.settings.bio_info"
+                  persistent-placeholder
+                  persistent-hint
+              />
+            </v-row>
+            <v-row no-gutters>
+              <v-textarea
+                  v-model.trim="store.articleEdit.description"
+                  :tile=true
+                  label="Beschreibung"
+                  counter
+                  :persistentCounter=true
+                  rows="6"
+                  no-resize
+                  :readonly="!edit"
+                  persistent-placeholder
+              >
+                <template v-slot:counter="{ counter }">
+                  <span>{{ counter }} von {{ store.ingredientsMaxChars  }} Zeichen.</span>
+                </template>
+              </v-textarea>
+            </v-row>
           </v-col>
 
           <v-col cols="5" style="padding: 5px;">
-            <v-textarea
-                v-model.trim="store.articleEdit.ingredients"
-                :tile=true
-                label="Zutaten"
-                counter
-                :persistentCounter=true
-                rows="6"
-                no-resize
-                :readonly="!edit"
-                persistent-placeholder
-            >
-              <template v-slot:counter="{ counter }">
-                <span>{{ counter }} von {{ store.ingredientsMaxChars  }} Zeichen.</span>
-              </template>
-            </v-textarea>
+            <v-row no-gutters>
+              <v-text-field
+                  v-model.trim="store.articleEdit.allergens_text"
+                  label="Allergen Hinweis"
+                  :hint="store.settings.allergens_text"
+                  persistent-placeholder
+                  persistent-hint
+              />
+            </v-row>
+            <v-row no-gutters>
+              <v-textarea
+                  v-model.trim="store.articleEdit.ingredients"
+                  :tile=true
+                  label="Zutaten"
+                  counter
+                  :persistentCounter=true
+                  rows="6"
+                  no-resize
+                  :readonly="!edit"
+                  persistent-placeholder
+              >
+                <template v-slot:counter="{ counter }">
+                  <span>{{ counter }} von {{ store.ingredientsMaxChars  }} Zeichen.</span>
+                </template>
+              </v-textarea>
+            </v-row>
           </v-col>
         </v-row>
       </v-card-text>