fix adding tabular attribute

Signed-off-by: Vinzenz Rosenkranz <[email protected]>
DH-Center-Tuebingen · Aug 1, 2024 · a671111 · a671111
1 parent 7c474a0
commit a671111
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/app/Http/Controllers/EditorController.php b/app/Http/Controllers/EditorController.php
@@ -248,7 +248,9 @@ public function addAttribute(Request $request) {
                     $purl = ThConcept::find($pid)->concept_url;
                     $childAttr->thesaurus_root_url = $purl;
                 }
-                $childAttr->restrictions = $col['restricted_types'];
+                if(array_key_exists('restricted_types', $col)) {
+                    $childAttr->restrictions = $col['restricted_types'];
+                }
                 $childAttr->parent_id = $attr->id;
                 $childAttr->save();
             }

diff --git a/resources/js/components/attribute/Tabular.vue b/resources/js/components/attribute/Tabular.vue
@@ -279,15 +279,10 @@
                 required: false,
                 default: false,
             },
-            preview: {
-                required: false,
-                type: Boolean,
-                default: false,
-            },
-            previewData: {
+            previewColumns: {
                 required: false,
                 type: Object,
-                default: null,
+                default: _ => new Object(),
             },
         },
         emits: ['change', 'expanded'],
@@ -311,8 +306,7 @@
                 selections,
                 attribute,
                 hideLinks,
-                preview,
-                previewData,
+                previewColumns,
             } = toRefs(props);
 
             // FETCH
@@ -510,9 +504,12 @@
                 initialValue: value.value,
             });
             const state = reactive({
-                isPreview: computed(_ => preview.value && previewData.value && Object.keys(previewData.value).length > 0),
-                columns: computed(_ => state.isPreview ? previewData.value : getAttribute(attribute.value.id).columns),
-                placeholderWidth: computed(_ => Object.keys(state.columns).length + 2),
+                isPreview: computed(_ => previewColumns.value && Object.keys(previewColumns.value).length > 0),
+                columns: computed(_ => state.isPreview ? previewColumns.value : getAttribute(attribute.value.id).columns),
+                placeholderWidth: computed(_ => {
+                    const colCnt = state.columns ? Object.keys(state.columns).length : 0;
+                    return colCnt + 2;
+                }),
                 selections: computed(_ => {
                     const list = {};
                     if(!state.columns || state.isPreview) return list;