Merge branch 'pu/sd/VAlert_MultiOptionDialog' into '2024.11'

fix(VAlert): autoHeight set to true in v-alert See merge request tine20/tine20!4854
tine-groupware · Jan 30, 2024 · 5df0d6d · 5df0d6d
2 parents b3c9613 + 12d1884
commit 5df0d6d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/tine20/Tinebase/js/widgets/dialog/MultiOptionsDialog.js b/tine20/Tinebase/js/widgets/dialog/MultiOptionsDialog.js
@@ -78,22 +78,18 @@ Ext.extend(Tine.widgets.dialog.MultiOptionsDialog, Ext.FormPanel, {
                 border: false,
                 layout: 'fit',
                 flex: 1,
+                autoHeight: true,
                 autoScroll: true,
                 items: [{
-                    xtype: 'label',
-                    border: false,
-                    cls: 'ext-mb-text',
-                    html: this.questionText || i18n._('What would you like to do?')
+                    xtype: 'v-alert',
+                    label: this.questionText || i18n._('What would you like to do?')
                 }, {
                     xtype: this.allowMultiple ? 'checkboxgroup' : 'radiogroup',
                     hideLabel: true,
                     itemCls: 'x-check-group-alt',
                     columns: 1,
                     name: 'optionGroup',
                     items: this.getItems()
-                }, {
-                    xtype: 'v-alert',
-                    label: i18n._('Please choose an option.')
                 }]
             }]
         }];

diff --git a/tine20/library/ExtJS/src/widgets/form/VueAlert/VueAlert.vue b/tine20/library/ExtJS/src/widgets/form/VueAlert/VueAlert.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="bootstrap-scope">
-    <BAlert :model-value="true" variant="primary" class="h-25">{{label}}</BAlert>
+    <BAlert :model-value="true" variant="primary"><span v-html="label"/></BAlert>
   </div>
 </template>
 

diff --git a/tine20/library/ExtJS/src/widgets/form/VueAlert/index.js b/tine20/library/ExtJS/src/widgets/form/VueAlert/index.js
@@ -5,6 +5,8 @@ Ext.form.VueAlert = Ext.extend(Ext.BoxComponent, {
     label: '',
     props: null,
 
+    autoHeight: true,
+
     initComponent: async function() {
         const {createApp, h, reactive} = window.vue
         const {default: VueAlert} = await import(/* webpackChunkName: "Tinebase/vue/VueAlert"*/'./VueAlert.vue')