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

5334-editDepartment #1521

Merged
carlossa merged 84 commits from 5334-editDepartment into dev 2023-07-06 07:09:06 +00:00
Conversation 0 Commits 84 Files Changed 33 +7 -10
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2b06c62876 - Show all commits

3
front/salix/components/left-menu/left-menu.js
View File

@ -45,6 +45,9 @@ export default class LeftMenu {
if (acl && !this.aclService.hasAny(acl))
continue;
}
console.log('MyItem:', item);
console.log('MyState:', state);
console.log(item.description, state.description);
let myItem = {
icon: item.icon,
description: item.description || state.description,

5
modules/worker/front/department/basic-data/index.js
View File

@ -15,13 +15,10 @@ class Controller extends Section {
}
}
ngModule.vnComponent('vnWorkerBasicData', {
ngModule.vnComponent('vnWorkerDepartmentBasicData', {
template: require('./index.html'),
controller: Controller,
bindings: {
worker: '<'
},
require: {
card: '^vnWorkerCard'
}
});

5
modules/worker/front/department/main/index.html
View File

@ -12,9 +12,6 @@
model="model">
</vn-searchbar>
</vn-portal>
<vn-portal slot="menu">
<vn-left-menu></vn-left-menu>
</vn-portal>
<ui-view>
<vn-worker-department-index></vn-worker-department-index>
</ui-view>
</ui-view>

4
modules/worker/front/routes.json
View File

@ -122,8 +122,8 @@
}, {
"url": "/department?q",
"state": "worker.department",
"description":"Departments",
alexm commented 2023-06-01 06:14:45 +00:00
Outdated
Review
Copy Link

El ACL es deuria mantindre

El ACL es deuria mantindre
"component": "vn-worker-department"
"component": "vn-worker-department",
"description":"Departments"
}, {
"url": "/:id",
alexm commented 2023-06-21 06:37:44 +00:00
Outdated
Review
Copy Link

Aci "acl" employee. Revisa que les modificacions estiguen ben possats els acls per a hr

Aci "acl" employee. Revisa que les modificacions estiguen ben possats els acls per a hr
"state": "worker.department.card",
carlossa marked this conversation as resolved
alexm commented 2023-06-01 06:15:27 +00:00
Review
Copy Link

Department deuria tindre ACLs en les seues seccions? @jgallego

Department deuria tindre ACLs en les seues seccions? @jgallego
jgallego commented 2023-06-01 07:30:30 +00:00
Review
Copy Link

Si, editar rrhh, visualizar employee.

Si, editar rrhh, visualizar employee.