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

5934-clientSms #1675

Merged
alexm merged 5 commits from 5934-clientSms into dev 2023-07-20 07:01:02 +00:00
Conversation 0 Commits 5 Files Changed 9 +5 -8
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ab95ef74a9 - Show all commits

6
db/changes/233001/00-clientSms.sql
View File

@ -7,9 +7,9 @@ CREATE TABLE `vn`.`clientSms` (
KEY `clientSms_FK_1` (`smsFk`),
CONSTRAINT `clientSms_FK` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE,
CONSTRAINT `clientSms_FK_1` FOREIGN KEY (`smsFk`) REFERENCES `sms` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
VALUES
('ClientSms', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
('ClientSms', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee');
('ClientSms', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
('ClientSms', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');

3
modules/client/back/models/client-sms.json
View File

@ -14,9 +14,6 @@
},
"clientFk": {
"type": "number"
},
"smsFk": {
"type": "number"
}
},
vicent marked this conversation as resolved
alexm commented 2023-07-19 05:11:16 +00:00
Review
Copy Link

Me sona que quan ja tens la relacio baix, no cal possar tambe el camp en properties

Me sona que quan ja tens la relacio baix, no cal possar tambe el camp en properties
"relations": {

4
modules/client/front/sms/index.html
View File

@ -3,7 +3,7 @@
url="ClientSms"
link="{clientFk: $ctrl.$params.id}"
filter="::$ctrl.filter"
data="clientSmss"
data="clientSmsList"
limit="20"
auto-load="true">
</vn-crud-model>
@ -20,7 +20,7 @@
</vn-tr>
</vn-thead>
<vn-tbody>
<vn-tr ng-repeat="clientSms in clientSmss">
<vn-tr ng-repeat="clientSms in clientSmsList">
<vn-td>
<span class="link" ng-click="workerDescriptor.show($event, clientSms.sms.senderFk)">
{{::clientSms.sms.sender.name}}