7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
2 changed files with 7 additions and 4 deletions
Showing only changes of commit 365e05d560 - Show all commits

View File

@ -9,4 +9,6 @@ INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalTyp
('SaleTracking','updateTracking','WRITE','ALLOW','ROLE','employee'),
('SaleTracking','mark','WRITE','ALLOW','ROLE','employee'),
('ItemBarcode','deleteByItemAndCode','WRITE','ALLOW','ROLE','employee'),
('Collection','addItem','WRITE','ALLOW','ROLE','employee');
('Collection','addItem','WRITE','ALLOW','ROLE','employee');
('ExpeditionPallet', '*', 'READ', 'ALLOW', 'ROLE', 'production');

View File

@ -7,7 +7,7 @@ module.exports = Self => {
verb: 'GET'
},
returns: {
type: 'object',
type: ['object'],
},
});
@ -30,10 +30,11 @@ module.exports = Self => {
if (operator) {
const printer = operator.printer();
return {
console.log({
id: printer.id,
name: printer.name
};
});
return Array.isArray(printer) ? printer : [printer];
}
};
};