From 8a319be08b35de7dfc2f5cf64a98e00768ddf3c6 Mon Sep 17 00:00:00 2001 From: gadezist Date: Thu, 6 Oct 2022 17:39:37 +0300 Subject: [PATCH 1/2] HP-1047 Change 'Type' dropdown to Select2 in the detalization UI --- src/widgets/combo/InternalObjectCombo.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/widgets/combo/InternalObjectCombo.php b/src/widgets/combo/InternalObjectCombo.php index 8b6efe55..65d0ccfe 100644 --- a/src/widgets/combo/InternalObjectCombo.php +++ b/src/widgets/combo/InternalObjectCombo.php @@ -164,11 +164,17 @@ private function registerSpecialAssets(): void $('#' + objectInputId).find('option').remove().end().val(null).trigger('change'); }); } + }, + deleteItem: function (widgetOptions, e, elem) { + widgetOptions.min -= 1; + originalDynamicForm('deleteItem', widgetOptions, e, elem); } }; $.fn.yiiDynamicForm = function(method) { if (method === 'addItem') { return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 )); + } else if (method === 'deleteItem') { + return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 )); } originalDynamicForm.apply(this, arguments); } From 04aa5e1c21343f0e83d06a381aff5a14198cc363 Mon Sep 17 00:00:00 2001 From: gadezist Date: Thu, 6 Oct 2022 18:11:34 +0300 Subject: [PATCH 2/2] HP-1047 Fix dropdown to Select2 in the detalization UI --- src/widgets/combo/InternalObjectCombo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/widgets/combo/InternalObjectCombo.php b/src/widgets/combo/InternalObjectCombo.php index 65d0ccfe..f31fa904 100644 --- a/src/widgets/combo/InternalObjectCombo.php +++ b/src/widgets/combo/InternalObjectCombo.php @@ -166,7 +166,9 @@ private function registerSpecialAssets(): void } }, deleteItem: function (widgetOptions, e, elem) { - widgetOptions.min -= 1; + if (widgetOptions.widgetContainer === 'charges_dynamicform_wrapper' && widgetOptions.min > 0) { + widgetOptions.min -= 1; + } originalDynamicForm('deleteItem', widgetOptions, e, elem); } };