7983-testToMaster_2438 #2977

Merged
alexm merged 212 commits from 7983-testToMaster_2438 into master 2024-09-17 05:36:47 +00:00
1 changed files with 2 additions and 36 deletions
Showing only changes of commit eb11e18df5 - Show all commits

View File

@ -36,42 +36,8 @@ class Controller extends Descriptor {
}
loadData() {
const filter = {
include: [
{
relation: 'user',
scope: {
fields: ['name', 'emailVerified'],
include: {
relation: 'emailUser',
scope: {
fields: ['email']
}
}
}
}, {
relation: 'client',
scope: {
fields: ['fi']
}
}, {
relation: 'sip',
scope: {
fields: ['extension']
}
}, {
relation: 'department',
scope: {
include: {
relation: 'department'
}
}
}
]
};
return this.getData(`Workers/${this.id}`, {filter})
.then(res => this.entity = res.data);
return this.getData('Workers/descriptor', {filter: {where: {id: this.id}}})
.then(res => this.entity = res.data[0]);
}
getPassRequirements() {