verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch '2079-acl_update_ticket_weekly' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Bernat Exposito 2020-02-13 07:39:17 +00:00 committed by Gitea
parent a3e0d0d628 4b48a89eaa
commit e1bb3649de
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/changes/10150-entry/00-acl.sql Normal file
View File

@ -0,0 +1,3 @@
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
VALUES ('TicketWeekly', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer');
UPDATE salix.ACL SET accessType = 'READ' WHERE (id = '91');

2
e2e/paths/05-ticket/09_weekly.spec.js
View File

@ -8,7 +8,7 @@ describe('Ticket descriptor path', () => {
beforeAll(async() => { beforeAll(async() => {
browser = await getBrowser(); browser = await getBrowser();
page = browser.page; page = browser.page;
await page.loginAndModule('employee', 'ticket'); await page.loginAndModule('buyer', 'ticket');
await page.accessToSection('ticket.weekly.index'); await page.accessToSection('ticket.weekly.index');
}); });

6
modules/ticket/front/descriptor/index.js
View File

@ -7,7 +7,11 @@ class Controller extends Component {
this.aclService = aclService; this.aclService = aclService;
this.$httpParamSerializer = $httpParamSerializer; this.$httpParamSerializer = $httpParamSerializer;
this.moreOptions = [ this.moreOptions = [
{name: 'Add turn', callback: this.showAddTurnDialog}, {
name: 'Add turn',
acl: 'buyer',
callback: this.showAddTurnDialog
},
{name: 'Show Delivery Note', callback: this.showDeliveryNote}, {name: 'Show Delivery Note', callback: this.showDeliveryNote},
{name: 'Send Delivery Note', callback: this.confirmDeliveryNote}, {name: 'Send Delivery Note', callback: this.confirmDeliveryNote},
{name: 'Delete ticket', callback: this.showDeleteTicketDialog}, {name: 'Delete ticket', callback: this.showDeleteTicketDialog},