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

#5666 - Loggable to mixin #1826

Merged
alexm merged 29 commits from 5666-loggable_to_mixin into dev 2024-01-04 09:21:57 +00:00
Conversation 0 Commits 29 Files Changed 92 +15 -7
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 035b31d878 - Show all commits

6
front/core/directives/rule.js
View File

@ -23,7 +23,7 @@ export function directive($translate, $window) {
let rule = $attrs.rule.split('.');
let modelName = rule.shift();
let fieldName = rule.shift();
let modelAlias = $attrs.ruleAlias;
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2023-12-05 12:13:18 +00:00
Outdated
Review
Copy Link

He añadido este attrs para que desde las rutas de role/:id/basic-data y create se puedan cargar los datos entrantes del registro

He añadido este attrs para que desde las rutas de role/:id/basic-data y create se puedan cargar los datos entrantes del registro
juan commented 2023-12-11 08:44:39 +00:00
Outdated
Review
Copy Link

No es necesario modificar rule, hay que usar rule="VnRule.[propiedad]" para que aplique las reglas de validación del modelo VnRole

No es necesario modificar rule, hay que usar `rule="VnRule.[propiedad]"` para que aplique las reglas de validación del modelo `VnRole`
let split = $attrs.ngModel.split('.');
if (!fieldName) fieldName = split.pop() || null;
if (!modelName) modelName = firstUpper(split.pop() || '');
@ -31,8 +31,12 @@ export function directive($translate, $window) {
if (!modelName || !fieldName)
throw new Error(`rule: Cannot retrieve model or field attribute`);
let modelValidations = vnValidations[modelName];
if (!modelValidations)
modelValidations = vnValidations[modelAlias];
if (!modelValidations)
throw new Error(`rule: Model '${modelName}' doesn't exist`);

10
modules/account/front/role/basic-data/index.html
View File

@ -7,6 +7,7 @@
<form
name="form"
ng-submit="watcher.submit()"
class="vn-w-md">
<vn-card class="vn-pa-lg">
<vn-vertical>
@ -14,12 +15,15 @@
label="Name"
ng-model="$ctrl.role.name"
rule
rule-alias="VnRole"
vn-focus>
</vn-textfield>
<vn-textfield
label="Description"
ng-model="$ctrl.role.description"
rule>
label="Description"
ng-model="$ctrl.role.description"
rule
rule-alias="VnRole"
>
</vn-textfield>
</vn-vertical>
</vn-card>

4
modules/account/front/role/create/index.html
View File

@ -13,13 +13,13 @@
<vn-vertical>
<vn-textfield
label="Name"
ng-model="$ctrl.role.name"
ng-model="$ctrl.VnRole.name"
rule
vn-focus>
</vn-textfield>
<vn-textfield
label="Description"
ng-model="$ctrl.role.description"
ng-model="$ctrl.VnRole.description"
jsegarra marked this conversation as resolved Outdated
juan commented 2023-12-11 08:43:25 +00:00
Outdated
Review
Copy Link

En lugar de modificar la directiva rule, hay que utilizar rule="VnRole.[propiedad]" para que aplique las reglas del modelo VnRole

En lugar de modificar la directiva rule, hay que utilizar `rule="VnRole.[propiedad]"` para que aplique las reglas del modelo VnRole
rule>
</vn-textfield>
</vn-vertical>

2
modules/account/front/role/descriptor/index.html
View File

@ -24,4 +24,4 @@
on-accept="$ctrl.onDelete()"
question="Are you sure you want to continue?"
message="Role will be removed">
</vn-confirm>
</vn-confirm>