3069-client.shelving #1029

Merged
joan merged 16 commits from 3069-client.shelving into dev 2022-08-05 09:18:56 +00:00
6 changed files with 29 additions and 8 deletions
Showing only changes of commit c56ac1c192 - Show all commits

View File

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

View File

@ -4,5 +4,8 @@
}, },
"Shelving": { "Shelving": {
"dataSource": "vn" "dataSource": "vn"
},
"ShelvingLog": {
"dataSource": "vn"
} }
} }

View File

@ -8,20 +8,20 @@
}, },
"properties": { "properties": {
"id": { "id": {
"type": "number",
"id": true, "id": true,
"description": "Identifier" "type": "number",
"forceId": false
}, },
"originFk": { "originFk": {
"type": "string", "type": "string",
"required": true "required": true
}, },
"userFk": { "userFk": {
"type": "number", "type": "number"
"required": true
}, },
"action": { "action": {
"type": "string" "type": "string",
"required": true
}, },
"creationDate": { "creationDate": {
"type": "date" "type": "date"
@ -44,5 +44,15 @@
"changedModelValue": { "changedModelValue": {
"type": "string" "type": "string"
} }
},
"relations": {
"user": {
"type": "belongsTo",
"model": "Account",
"foreignKey": "userFk"
}
},
"scope": {
"order": ["creationDate DESC", "id DESC"]
} }
} }

View File

@ -1,6 +1,10 @@
{ {
"name": "Shelving", "name": "Shelving",
"base": "VnModel", "base": "Loggable",
"log": {
"model": "ShelvingLog",
"showField": "id"
},
"options": { "options": {
"mysql": { "mysql": {
"table": "shelving" "table": "shelving"

View File

@ -8,3 +8,4 @@ import './index/';
import './main'; import './main';
import './search-panel'; import './search-panel';
import './summary'; import './summary';
import './log';

View File

@ -1 +1 @@
<vn-log url="ShelvingLog" origin-id="$ctrl.$params.id"></vn-log> <vn-log url="ShelvingLogs" origin-id="$ctrl.$params.code"></vn-log>