From a8355ff45523ef20a5fccfcd9c64a735c4775292 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez <=>
Date: Mon, 29 Oct 2018 10:42:43 +0100
Subject: [PATCH 1/4] #756 ticket.sale-tracking scss fixes
---
client/core/src/components/fetched-tags/index.html | 4 ++--
client/core/src/components/fetched-tags/style.scss | 9 ++++++++-
client/ticket/src/component/style.scss | 12 ------------
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/client/core/src/components/fetched-tags/index.html b/client/core/src/components/fetched-tags/index.html
index e9f80c028..88bade0d3 100644
--- a/client/core/src/components/fetched-tags/index.html
+++ b/client/core/src/components/fetched-tags/index.html
@@ -1,11 +1,11 @@
{{::$ctrl.concept}}
-
+
-
+
\ No newline at end of file
diff --git a/client/core/src/components/fetched-tags/style.scss b/client/core/src/components/fetched-tags/style.scss
index 2d6ffa493..70a92d21f 100644
--- a/client/core/src/components/fetched-tags/style.scss
+++ b/client/core/src/components/fetched-tags/style.scss
@@ -22,7 +22,7 @@ vn-fetched-tags {
}
}
- @media screen and (max-width: 1200px){
+ @media screen and (max-width: 1200px) {
& vn-horizontal {
.inline-tag {
font-size: 0.6em;
@@ -31,9 +31,15 @@ vn-fetched-tags {
}
}
+ & vn-horizontal {
+ flex-direction: column;
+ text-align: center;
+ }
& vn-one {
+ white-space: nowrap;
padding-top: 0.2em
+
}
& vn-two {
@@ -43,6 +49,7 @@ vn-fetched-tags {
& .inline-tag {
background-color: $secondary-font-color;
display: inline-block;
+ float: none;
color: $color-white;
margin-right: 0.4em;
text-align: center;
diff --git a/client/ticket/src/component/style.scss b/client/ticket/src/component/style.scss
index 08a16c8f0..85bb673e0 100644
--- a/client/ticket/src/component/style.scss
+++ b/client/ticket/src/component/style.scss
@@ -1,16 +1,4 @@
vn-ticket-components {
- vn-fetched-tags {
- & vn-horizontal {
- flex-direction: column;
- text-align: center;
-
- & .inline-tag {
- display: inline-block;
- float: none
- }
- }
- }
-
.vn-grid {
tbody:not(:last-child) {
border-bottom: none;
From ba778d5d315e3b4fd5bdcb1c12ad8b93a3fab870 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez <=>
Date: Mon, 29 Oct 2018 11:07:48 +0100
Subject: [PATCH 2/4] #774 Arreglar e2e de ticket expeditions
---
e2e/helpers/selectors.js | 1 +
e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 074c9b9f3..1c7371fca 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -300,6 +300,7 @@ export default {
ticketExpedition: {
expeditionButton: `vn-menu-item a[ui-sref="ticket.card.expedition"]`,
secondExpeditionRemoveButton: `vn-ticket-expedition vn-table div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(1) > vn-icon-button[icon="delete"]`,
+ acceptDeleteRowButton: `vn-ticket-expedition > vn-confirm[vn-id="delete-expedition"] button[response=ACCEPT]`,
expeditionRow: `vn-ticket-expedition vn-table vn-tbody > vn-tr`,
},
ticketPackages: {
diff --git a/e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js b/e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js
index 409a0659c..459463708 100644
--- a/e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js
+++ b/e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js
@@ -41,9 +41,10 @@ describe('Ticket', () => {
expect(url).toContain('expedition');
});
- it(`should delete a former expedition and confirm the remaining expedition are the expected one`, async () => {
+ it(`should delete a former expedition and confirm the remaining expedition are the expected ones`, async () => {
const result = await nightmare
.waitToClick(selectors.ticketExpedition.secondExpeditionRemoveButton)
+ .waitToClick(selectors.ticketExpedition.acceptDeleteRowButton)
.click(selectors.ticketPackages.packagesButton)
.wait(selectors.ticketPackages.firstPackageSelect)
.click(selectors.ticketExpedition.expeditionButton)
From 5480c5bdbfc396e513cc94b12e8049e5cea34137 Mon Sep 17 00:00:00 2001
From: Bernat
Date: Mon, 29 Oct 2018 11:35:17 +0100
Subject: [PATCH 3/4] update structure table logs
---
.../changes/1.2-CHECK/02-beforeInsertItemLog.sql | 11 +++++++++++
.../changes/1.2-CHECK/03-beforeInsertClientLog.sql | 11 +++++++++++
.../changes/1.2-CHECK/05-beforeInsertClaimLog.sql | 11 +++++++++++
.../changes/1.2-CHECK/06-beforeInsertTicketLog.sql | 11 +++++++++++
4 files changed, 44 insertions(+)
create mode 100644 services/db/install/changes/1.2-CHECK/02-beforeInsertItemLog.sql
create mode 100644 services/db/install/changes/1.2-CHECK/03-beforeInsertClientLog.sql
create mode 100644 services/db/install/changes/1.2-CHECK/05-beforeInsertClaimLog.sql
create mode 100644 services/db/install/changes/1.2-CHECK/06-beforeInsertTicketLog.sql
diff --git a/services/db/install/changes/1.2-CHECK/02-beforeInsertItemLog.sql b/services/db/install/changes/1.2-CHECK/02-beforeInsertItemLog.sql
new file mode 100644
index 000000000..f3e9c6f4a
--- /dev/null
+++ b/services/db/install/changes/1.2-CHECK/02-beforeInsertItemLog.sql
@@ -0,0 +1,11 @@
+DROP TRIGGER IF EXISTS `vn`.`itemLog_BEFORE_INSERT`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`itemLog_BEFORE_INSERT` BEFORE INSERT ON `itemLog` FOR EACH ROW
+BEGIN
+ IF NEW.newInstance is NULL THEN
+ SET NEW.newInstance = NEW.description;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/services/db/install/changes/1.2-CHECK/03-beforeInsertClientLog.sql b/services/db/install/changes/1.2-CHECK/03-beforeInsertClientLog.sql
new file mode 100644
index 000000000..ec6b31e76
--- /dev/null
+++ b/services/db/install/changes/1.2-CHECK/03-beforeInsertClientLog.sql
@@ -0,0 +1,11 @@
+DROP TRIGGER IF EXISTS `vn`.`ticketLog_BEFORE_INSERT`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`ticketLog_BEFORE_INSERT` BEFORE INSERT ON `ticketLog` FOR EACH ROW
+BEGIN
+ IF NEW.newInstance is NULL THEN
+ SET NEW.newInstance = NEW.description;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/services/db/install/changes/1.2-CHECK/05-beforeInsertClaimLog.sql b/services/db/install/changes/1.2-CHECK/05-beforeInsertClaimLog.sql
new file mode 100644
index 000000000..37fa97755
--- /dev/null
+++ b/services/db/install/changes/1.2-CHECK/05-beforeInsertClaimLog.sql
@@ -0,0 +1,11 @@
+DROP TRIGGER IF EXISTS `vn`.`claimLog_BEFORE_INSERT`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`claimLog_BEFORE_INSERT` BEFORE INSERT ON `claimLog` FOR EACH ROW
+BEGIN
+ IF NEW.newInstance is NULL THEN
+ SET NEW.newInstance = NEW.description;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/services/db/install/changes/1.2-CHECK/06-beforeInsertTicketLog.sql b/services/db/install/changes/1.2-CHECK/06-beforeInsertTicketLog.sql
new file mode 100644
index 000000000..357f2a80d
--- /dev/null
+++ b/services/db/install/changes/1.2-CHECK/06-beforeInsertTicketLog.sql
@@ -0,0 +1,11 @@
+DROP TRIGGER IF EXISTS `vn`.`clientLog_BEFORE_INSERT`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`clientLog_BEFORE_INSERT` BEFORE INSERT ON `clientLog` FOR EACH ROW
+BEGIN
+ IF NEW.newInstance is NULL THEN
+ SET NEW.newInstance = NEW.description;
+ END IF;
+END$$
+DELIMITER ;
From b0c8ac7062c7837c7905ee7d92ab94bc19f1eaf4 Mon Sep 17 00:00:00 2001
From: Bernat
Date: Mon, 29 Oct 2018 11:53:32 +0100
Subject: [PATCH 4/4] update acl
---
services/db/install/changes/1.0-OnlyLocal/07-fieldAcl.sql | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/services/db/install/changes/1.0-OnlyLocal/07-fieldAcl.sql b/services/db/install/changes/1.0-OnlyLocal/07-fieldAcl.sql
index e5b3f2c56..e17606970 100644
--- a/services/db/install/changes/1.0-OnlyLocal/07-fieldAcl.sql
+++ b/services/db/install/changes/1.0-OnlyLocal/07-fieldAcl.sql
@@ -75,3 +75,8 @@ DELETE FROM `salix`.`ACL` WHERE `id`='59';
DELETE FROM `salix`.`ACL` WHERE `id`='57';
INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (116, 'BankEntity', '*', '*', 'ALLOW', 'role', 'employee');
INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (117, 'ClientSample', '*', '*', 'ALLOW', 'role', 'employee');
+
+
+
+
+INSERT INTO `salix`.`fieldAcl` (`model`, `property`, `actionType`, `role`) VALUES ('TicketWeekly', '*', '*', 'employee');
\ No newline at end of file