From eda70b009b68d15d2fe69ce98fcc054f851cefda Mon Sep 17 00:00:00 2001 From: vicent Date: Tue, 21 Feb 2023 11:48:56 +0100 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20cuando=20haces=20F5=20en=20cualquier?= =?UTF-8?q?=20secci=C3=B3n=20que=20no=20sea=20Diary,=20te=20coge=20el=20wa?= =?UTF-8?q?rehouse=20por=20defecto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/item/front/card/index.js | 19 +++++++++++++++++++ modules/item/front/diary/index.js | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/modules/item/front/card/index.js b/modules/item/front/card/index.js index 8b32e030b0..2fe42fd047 100644 --- a/modules/item/front/card/index.js +++ b/modules/item/front/card/index.js @@ -5,6 +5,25 @@ class Controller extends ModuleCard { reload() { this.$http.get(`Items/${this.$params.id}/getCard`) .then(res => this.item = res.data); + + this.$http.get('ItemConfigs/findOne') + .then(res => { + if (this.$state.getCurrentPath()[4].state.name === 'item.card.diary') return; + this.warehouseFk = res.data.warehouseFk; + this.getWarehouseName(res.data.warehouseFk); + }); + } + + getWarehouseName(warehouseFk) { + const filter = { + where: {id: warehouseFk} + }; + this.$http.get('Warehouses/findOne', {filter}) + .then(res => { + this.warehouseText = this.$t('WarehouseFk', { + warehouseName: res.data.name + }); + }); } } diff --git a/modules/item/front/diary/index.js b/modules/item/front/diary/index.js index 945e1fd312..9e104c8e67 100644 --- a/modules/item/front/diary/index.js +++ b/modules/item/front/diary/index.js @@ -68,6 +68,10 @@ class Controller extends Section { this.$[descriptor].show(event.target, sale.origin); } + + $onDestroy() { + this.card.reload(); + } } Controller.$inject = ['$element', '$scope', '$anchorScroll', '$location']; From c30242f9cc6772584537eada662cfeb84d0fef66 Mon Sep 17 00:00:00 2001 From: vicent Date: Tue, 21 Feb 2023 12:17:16 +0100 Subject: [PATCH 2/3] fix: front test --- modules/item/front/card/index.spec.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/item/front/card/index.spec.js b/modules/item/front/card/index.spec.js index 2c97f5935d..6ebce3d36b 100644 --- a/modules/item/front/card/index.spec.js +++ b/modules/item/front/card/index.spec.js @@ -4,12 +4,15 @@ describe('Item', () => { describe('Component vnItemCard', () => { let controller; let $httpBackend; + let $state; let data = {id: 1, name: 'fooName'}; beforeEach(ngModule('item')); - beforeEach(inject(($componentController, _$httpBackend_, $stateParams) => { + beforeEach(inject(($componentController, _$httpBackend_, $stateParams, _$state_) => { $httpBackend = _$httpBackend_; + $state = _$state_; + $state.getCurrentPath = () => [null, null, null, null, {state: {name: 'item.card.diary'}}]; let $element = angular.element('
'); controller = $componentController('vnItemCard', {$element}); @@ -19,6 +22,7 @@ describe('Item', () => { })); it('should request data and set it on the controller', () => { + $httpBackend.expect('GET', `ItemConfigs/findOne`).respond({}); controller.reload(); $httpBackend.flush(); From 49c2ec7f9aee86e41cae02529d6224a62f8e0251 Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 21 Feb 2023 14:01:12 +0100 Subject: [PATCH 3/3] fix(image): Enabled failOn option Refs: #5266 --- back/models/image.js | 3 ++- package-lock.json | 18 +++++++++--------- package.json | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/back/models/image.js b/back/models/image.js index d736e924f8..f3c2029312 100644 --- a/back/models/image.js +++ b/back/models/image.js @@ -102,7 +102,8 @@ module.exports = Self => { width: bmpData.width, height: bmpData.height, channels: 4 - } + }, + failOn: 'none' }; } diff --git a/package-lock.json b/package-lock.json index 61180fa3f6..8a39bd9024 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "salix-back", - "version": "23.02.03", + "version": "23.04.01", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "salix-back", - "version": "23.02.03", + "version": "23.04.01", "license": "GPL-3.0", "dependencies": { "axios": "^1.2.2", @@ -40,7 +40,7 @@ "puppeteer": "^18.0.5", "read-chunk": "^3.2.0", "require-yaml": "0.0.1", - "sharp": "^0.31.2", + "sharp": "^0.31.3", "smbhash": "0.0.1", "strong-error-handler": "^2.3.2", "uuid": "^3.3.3", @@ -19715,9 +19715,9 @@ } }, "node_modules/sharp": { - "version": "0.31.2", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.2.tgz", - "integrity": "sha512-DUdNVEXgS5A97cTagSLIIp8dUZ/lZtk78iNVZgHdHbx1qnQR7JAHY0BnXnwwH39Iw+VKhO08CTYhIg0p98vQ5Q==", + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz", + "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==", "hasInstallScript": true, "dependencies": { "color": "^4.2.3", @@ -39863,9 +39863,9 @@ } }, "sharp": { - "version": "0.31.2", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.2.tgz", - "integrity": "sha512-DUdNVEXgS5A97cTagSLIIp8dUZ/lZtk78iNVZgHdHbx1qnQR7JAHY0BnXnwwH39Iw+VKhO08CTYhIg0p98vQ5Q==", + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz", + "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==", "requires": { "color": "^4.2.3", "detect-libc": "^2.0.1", diff --git a/package.json b/package.json index 17e4617b80..af4992b58d 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "puppeteer": "^18.0.5", "read-chunk": "^3.2.0", "require-yaml": "0.0.1", - "sharp": "^0.31.2", + "sharp": "^0.31.3", "smbhash": "0.0.1", "strong-error-handler": "^2.3.2", "uuid": "^3.3.3",