diff --git a/db/changes/10460-motherDay/00-aclItemType.sql b/db/changes/10460-motherDay/00-aclItemType.sql index 67dc652e5..836a69dfd 100644 --- a/db/changes/10460-motherDay/00-aclItemType.sql +++ b/db/changes/10460-motherDay/00-aclItemType.sql @@ -1,7 +1,4 @@ -INSERT INTO `salix`.`ACL` -(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) -VALUES('ItemType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'); - -INSERT INTO `salix`.`ACL` -(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) -VALUES('ItemType', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer'); \ No newline at end of file +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES + ('ItemType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'), + ('ItemType', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer'); \ No newline at end of file diff --git a/modules/item/back/models/item-type.json b/modules/item/back/models/item-type.json index 64061a9b3..407b4d15a 100644 --- a/modules/item/back/models/item-type.json +++ b/modules/item/back/models/item-type.json @@ -18,12 +18,6 @@ "name": { "type": "string" }, - "workerFk": { - "type": "number" - }, - "categoryFk": { - "type": "number" - }, "temperatureFk": { "type": "string" }, diff --git a/modules/item/front/item-type/card/index.spec.js b/modules/item/front/item-type/card/index.spec.js index 179f65274..ab2314bb9 100644 --- a/modules/item/front/item-type/card/index.spec.js +++ b/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); }); }); }); diff --git a/modules/item/front/item-type/descriptor/index.html b/modules/item/front/item-type/descriptor/index.html index ac86b2189..5a0e8ed49 100644 --- a/modules/item/front/item-type/descriptor/index.html +++ b/modules/item/front/item-type/descriptor/index.html @@ -22,10 +22,4 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/modules/item/front/item-type/descriptor/locale/es.yml b/modules/item/front/item-type/descriptor/locale/es.yml deleted file mode 100644 index 1ca512e4f..000000000 --- a/modules/item/front/item-type/descriptor/locale/es.yml +++ /dev/null @@ -1,2 +0,0 @@ -Role will be removed: El rol va a ser eliminado -Role removed: Rol eliminado \ No newline at end of file diff --git a/modules/item/front/item-type/search-panel/index.html b/modules/item/front/item-type/search-panel/index.html index 2e373fda5..4aa762900 100644 --- a/modules/item/front/item-type/search-panel/index.html +++ b/modules/item/front/item-type/search-panel/index.html @@ -4,7 +4,8 @@ + ng-model="filter.name" + vn-focus>