Merge branch 'dev' into 5983_inventory_parking

2023-07-19 14:29:18 +00:00 · 2023-07-19 14:29:18 +00:00 · 6344c11d1e
parent 7cff014988 1f7f903ec6
commit 6344c11d1e
2 changed files with 4 additions and 1 deletions
--- a/db/changes/233001/00-fixACLVehicle.sql
+++ b/db/changes/233001/00-fixACLVehicle.sql
@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalId`)
+    VALUES
+        ('Vehicle','sorted','WRITE','ALLOW','employee');
--- a/modules/item/front/fixed-price/index.html
+++ b/modules/item/front/fixed-price/index.html
@ -85,7 +85,7 @@
                                    show-field="id"
                                    value-field="id"
                                    search-function="$ctrl.itemSearchFunc($search)"
-                                    on-change="$ctrl.upsertPrice(price, true)"
+                                    ng-change="$ctrl.upsertPrice(price, true)"
                                    order="id DESC"
                                    tabindex="1">
                                    <tpl-item>