pull request changes required

db/changes/10440-fallas/00-aclAgency.sql

@@ -1,2 +1,2 @@
-INSERT INTO salix.ACL (id, model, property, accessType, permission, principalType, principalId)
+INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES(304, 'Agency', '*', '*', 'ALLOW', 'ROLE', 'employee');

db/changes/10440-fallas/00-aclSupplierAgencyTerms.sql

@@ -1,3 +1,3 @@
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES
         ('SupplierAgencyTerm', '*', '*', 'ALLOW', 'ROLE', 'administrative');

db/changes/10440-fallas/00-supplierAgencyTerm.sql

@@ -1,14 +1,14 @@
-ALTER TABLE vn.agencyTerm ADD supplierFk INT NULL;
+ALTER TABLE `vn`.`agencyTerm` ADD `supplierFk` INT NULL;
-ALTER TABLE vn.agencyTerm CHANGE supplierFk supplierFk INT NULL AFTER agencyFk;
+ALTER TABLE `vn`.`agencyTerm` CHANGE `supplierFk` `supplierFk` INT NULL AFTER `agencyFk`;
 
-UPDATE vn.agencyTerm `at`
+UPDATE `vn`.`agencyTerm` `at`
-	JOIN vn.agency a ON a.id = `at`.agencyFk
+	JOIN `vn`.`agency` `a` ON `a`.`id` = `at`.`agencyFk`
-SET `at`.supplierFk = a.supplierFk;
+SET `at`.`supplierFk` = `a`.`supplierFk`;
 
-ALTER TABLE vn.agencyTerm ADD CONSTRAINT agencyTerm_FK FOREIGN KEY (agencyFk) REFERENCES vn.agency(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE `vn`.`agencyTerm` ADD CONSTRAINT `agencyTerm_FK` FOREIGN KEY (`agencyFk`) REFERENCES `vn`.`agency`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE vn.agencyTerm ADD CONSTRAINT agencyTerm_FK_1 FOREIGN KEY (supplierFk) REFERENCES vn.supplier(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE `vn`.`agencyTerm` ADD CONSTRAINT `agencyTerm_FK_1` FOREIGN KEY (`supplierFk`) REFERENCES `vn`.`supplier`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
 
-RENAME TABLE vn.agencyTerm TO vn.supplierAgencyTerm;
+RENAME TABLE `vn`.`agencyTerm` TO `vn`.`supplierAgencyTerm`;
 
 CREATE OR REPLACE
 ALGORITHM = UNDEFINED 
@@ -26,8 +26,8 @@ SELECT
 FROM
     `vn`.`supplierAgencyTerm` `sat`;
 
-ALTER TABLE vn.agency DROP FOREIGN KEY agency_ibfk_4;
+ALTER TABLE `vn`.`agency` DROP FOREIGN KEY `agency_ibfk_4`;
-ALTER TABLE vn.agency CHANGE supplierFk supplierFk__ int(11) DEFAULT NULL NULL;
+ALTER TABLE `vn`.`agency` CHANGE `supplierFk` `supplierFk__` int(11) DEFAULT NULL NULL;
 
 CREATE OR REPLACE
 ALGORITHM = UNDEFINED 

modules/supplier/back/models/supplier-agency-term.js

@@ -1,4 +1,4 @@
-let UserError = require('vn-loopback/util/user-error');
+const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
     Self.rewriteDbError(function(err) {

modules/supplier/back/models/supplier-agency-term.json

@@ -42,13 +42,5 @@
             "model": "Agency",
             "foreignKey": "agencyFk"
         }
-    },
+    }
-    "acls": [
-        {
-        "accessType": "EXECUTE",
-        "principalType": "ROLE",
-        "principalId": "$everyone",
-        "permission": "ALLOW"
-        }
-    ]
 }

modules/supplier/front/routes.json

@@ -94,7 +94,7 @@
             "abstract": true
         }, 
         {
-            "url": "/index?q",
+            "url": "/index",
             "state": "supplier.card.agencyTerm.index",
             "component": "vn-supplier-agency-term-index",
             "description": "Autonomous",