PT-13514: bind current value directly in ui-select-match (#378)

VirtoCommerce · Sep 14, 2023 · d1ad181 · d1ad181
1 parent bfceded
commit d1ad181
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.tpl.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.tpl.html
@@ -35,7 +35,7 @@
     </label>
     <div class="form-input">
         <ui-select ng-model="blade.currentEntity.status" ng-disabled="blade.isLocked">
-            <ui-select-match placeholder="{{ 'orders.blades.customerOrder-detail.placeholders.status' | translate }}">{{$select.selected.value}}</ui-select-match>
+            <ui-select-match placeholder="{{ 'orders.blades.customerOrder-detail.placeholders.status' | translate }}">{{ blade.currentEntity.status }}</ui-select-match>
             <ui-select-choices repeat="x.key as x in blade.statuses | filter: {'value': $select.search}">
                 <span ng-bind-html="x.value | highlight: $select.search"></span>
             </ui-select-choices>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-items.tpl.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-items.tpl.html
@@ -49,7 +49,7 @@
                                 <div class="form-input __inline">
                                     <div class="form-input">
                                         <ui-select ng-model="data.status">
-                                            <ui-select-match allow-clear="true" placeholder="{{ 'orders.blades.customerOrder-detail.placeholders.status' | translate }}">{{$select.selected.value}}</ui-select-match>
+                                          <ui-select-match allow-clear="true" placeholder="{{ 'orders.blades.customerOrder-detail.placeholders.status' | translate }}">{{data.status}}</ui-select-match>
                                             <ui-select-choices repeat="x.key as x in blade.statuses | filter: {'value': $select.search}">
                                                 <span ng-bind-html="x.value | highlight: $select.search"></span>
                                             </ui-select-choices>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/payment-detail.tpl.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/payment-detail.tpl.html
@@ -48,7 +48,7 @@
                                 </label>
                                 <div class="form-input">
                                     <ui-select ng-model="blade.currentEntity.status" ng-change="blade.currentEntity.paymentStatus = $select.selected.key" ng-disabled="blade.isLocked">
-                                        <ui-select-match placeholder="{{ 'orders.blades.payment-detail.placeholders.status' | translate }}">{{$select.selected.value}}</ui-select-match>
+                                        <ui-select-match placeholder="{{ 'orders.blades.payment-detail.placeholders.status' | translate }}">{{ blade.currentEntity.status }}</ui-select-match>
                                         <ui-select-choices repeat="x.key as x in blade.statuses | filter: {'value': $select.search}">
                                             <span ng-bind-html="x.value | highlight: $select.search"></span>
                                         </ui-select-choices>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/refund-detail.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/refund-detail.html
@@ -20,7 +20,7 @@
                                 </label>
                                 <div class="form-input">
                                     <ui-select ng-model="blade.currentEntity.status" ng-change="blade.currentEntity.refundStatus = $select.selected.key" ng-disabled="blade.isLocked">
-                                        <ui-select-match placeholder="{{ 'orders.blades.refund-details.placeholders.status' | translate }}">{{$select.selected.value}}</ui-select-match>
+                                        <ui-select-match placeholder="{{ 'orders.blades.refund-details.placeholders.status' | translate }}">{{ blade.currentEntity.status }}</ui-select-match>
                                         <ui-select-choices repeat="x.key as x in blade.statuses | filter: {'value': $select.search}">
                                             <span ng-bind-html="x.value | highlight: $select.search"></span>
                                         </ui-select-choices>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/shipment-detail.tpl.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/shipment-detail.tpl.html
@@ -85,7 +85,7 @@
     </label>
     <div class="form-input">
         <ui-select ng-model="blade.currentEntity.status" ng-disabled="blade.isLocked">
-            <ui-select-match placeholder="{{ 'orders.blades.shipment-detail.placeholders.status' | translate }}">{{$select.selected.value}}</ui-select-match>
+            <ui-select-match placeholder="{{ 'orders.blades.shipment-detail.placeholders.status' | translate }}">{{ blade.currentEntity.status }}</ui-select-match>
             <ui-select-choices repeat="x.key as x in blade.statuses | filter: {'value': $select.search}">
                 <span ng-bind-html="x.value | highlight: $select.search"></span>
             </ui-select-choices>