verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 51 Releases Wiki Activity

4794-mdb_block #1170

Merged
vicent merged 17 commits from 4794-mdb_block into dev 2022-12-22 09:19:16 +00:00
Conversation 0 Commits 17 Files Changed 13 +9 -9
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f313a53cde - Show all commits

6
db/changes/10503-november/00-mdbApp.sql
View File

@ -1,11 +1,11 @@
CREATE TABLE `vn`.`mdbApp` ( CREATE TABLE `vn`.`mdbApp` (
`app` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `app` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
vicent marked this conversation as resolved Outdated
jgallego commented 2022-11-23 08:48:18 +00:00
Outdated
Review
Copy Link

primary key

primary key
`baselineBranchFk` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `baselineBranchFk` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`userFk` int(10) unsigned DEFAULT NULL, `userFk` int(10) unsigned DEFAULT NULL,
`locked` datetime DEFAULT NULL, `locked` datetime DEFAULT NULL,
UNIQUE KEY `app_UN` (`app`), PRIMARY KEY (`app`),
vicent marked this conversation as resolved Outdated
jgallego commented 2022-11-23 08:48:27 +00:00
Outdated
Review
Copy Link

quitar

quitar
KEY `mdbApp_FK` (`userFk`), KEY `mdbApp_FK` (`userFk`),
KEY `mdbApp_FK_1` (`baselineBranchFk`), KEY `mdbApp_FK_1` (`baselineBranchFk`),
CONSTRAINT `mdbApp_FK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `mdbApp_FK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
CONSTRAINT `mdbApp_FK_1` FOREIGN KEY (`baselineBranchFk`) REFERENCES `mdbBranch` (`name`) ON UPDATE CASCADE CONSTRAINT `mdbApp_FK_1` FOREIGN KEY (`baselineBranchFk`) REFERENCES `mdbBranch` (`name`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci

4
db/dump/fixtures.sql
View File

@ -2734,5 +2734,5 @@ INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`
INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`) INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`)
VALUES VALUES
('com', 'master', NULL, NULL), ('foo', 'master', NULL, NULL),
vicent marked this conversation as resolved Outdated
jgallego commented 2022-11-23 08:49:22 +00:00
Outdated
Review
Copy Link

no usar nombre "conocidos" ejemplo foo, bar

no usar nombre "conocidos" ejemplo foo, bar
('ent', 'test', 9, util.VN_NOW()); ('bar', 'test', 9, util.VN_NOW());

2
loopback/locale/es.json
View File

@ -245,5 +245,5 @@
"Already has this status": "Ya tiene este estado", "Already has this status": "Ya tiene este estado",
"There aren't records for this week": "No existen registros para esta semana", "There aren't records for this week": "No existen registros para esta semana",
"Empty data source": "Origen de datos vacio", "Empty data source": "Origen de datos vacio",
"App locked": "Aplicación bloquada por el usuario {{userId}}" "App locked": "Aplicación bloqueada por el usuario {{userId}}"
vicent marked this conversation as resolved Outdated
jgallego commented 2022-11-23 08:49:59 +00:00
Outdated
Review
Copy Link

bloqueada

bloqueada
} }

4
modules/mdb/back/methods/mdbApp/specs/lock.spec.js
View File

@ -7,7 +7,7 @@ describe('MdbApp lock()', () => {
try { try {
const options = {transaction: tx}; const options = {transaction: tx};
vicent marked this conversation as resolved Outdated
jgallego commented 2022-11-23 08:51:52 +00:00
Outdated
Review
Copy Link

foo

foo
const appName = 'ent'; const appName = 'bar';
const developerId = 9; const developerId = 9;
const ctx = { const ctx = {
req: { req: {
@ -35,7 +35,7 @@ describe('MdbApp lock()', () => {
try { try {
const options = {transaction: tx}; const options = {transaction: tx};
const appName = 'com'; const appName = 'foo';
const developerId = 9; const developerId = 9;
const ctx = {req: {accessToken: {userId: developerId}}}; const ctx = {req: {accessToken: {userId: developerId}}};

2
modules/mdb/back/methods/mdbApp/specs/unlock.spec.js
View File

@ -6,7 +6,7 @@ describe('MdbApp unlock()', () => {
try { try {
const options = {transaction: tx}; const options = {transaction: tx};
const appName = 'com'; const appName = 'bar';
const developerId = 9; const developerId = 9;
const ctx = {req: {accessToken: {userId: developerId}}}; const ctx = {req: {accessToken: {userId: developerId}}};