refactor: pull request changes

db/changes/10460-motherDay/00-aclItemType.sql

@@ -1,7 +1,4 @@
-INSERT INTO `salix`.`ACL`
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
-VALUES('ItemType', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
+        ('ItemType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
-
+        ('ItemType', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer');
-INSERT INTO `salix`.`ACL`
-(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-VALUES('ItemType', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer');

modules/item/back/models/item-type.json

@@ -18,12 +18,6 @@
         "name": {
             "type": "string"
         },
-        "workerFk": {
-            "type": "number"
-        },
-        "categoryFk": {
-            "type": "number"
-        },
         "temperatureFk": {
             "type": "string"
         },

modules/item/front/item-type/card/index.spec.js

@@ -15,11 +15,13 @@ describe('component vnItemTypeCard', () => {
         it('should reload the controller data', () => {
             controller.$params.id = 1;
 
-            $httpBackend.expectGET('ItemTypes/1').respond('foo');
+            const itemType = {id: 1};
+
+            $httpBackend.expectGET('ItemTypes/1').respond(itemType);
             controller.reload();
             $httpBackend.flush();
 
-            expect(controller.itemType).toBe('foo');
+            expect(controller.itemType).toEqual(itemType);
         });
     });
 });

modules/item/front/item-type/descriptor/index.html

@@ -22,10 +22,4 @@
             </vn-label-value>
         </div>
     </slot-body>
-</vn-descriptor-content>
+</vn-descriptor-content>
-<vn-confirm
-    vn-id="delete-itemType"
-    on-accept="$ctrl.onDelete()"
-    question="Are you sure you want to continue?"
-    message="ItemType will be removed">
-</vn-confirm>

modules/item/front/item-type/descriptor/locale/es.yml

@@ -1,2 +0,0 @@
-Role will be removed: El rol va a ser eliminado
-Role removed: Rol eliminado

modules/item/front/item-type/search-panel/index.html

@@ -4,7 +4,8 @@
             <vn-textfield
                 vn-one
                 label="Name"
-                ng-model="filter.name">
+                ng-model="filter.name"
+                vn-focus>
             </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>