pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_holidays: use record.resId

Browse Source 
Since the relational model was rewritten (PR 114024), the record id
is no longer present in data. We must replace record.data.id with record.resId.

closes odoo/odoo#130466

Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
This commit is contained in:
FrancoisGe
2023-08-02 16:00:28 +02:00
parent 0630caceac
commit 02c8a53bdc
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/static/src/views/view_dialog/form_view_dialog.js
+9 -9
View File
@@ -18,39 +18,39 @@ export class TimeOffDialogFormController extends FormController {
}
get record() {
return this.model.root.data;
return this.model.root;
}
async onClick(action) {
const args = (action === 'action_approve') ? [this.record.id, false] : [this.record.id];
const args = (action === 'action_approve') ? [this.record.resId, false] : [this.record.resId];
await this.orm.call("hr.leave", action, args);
this.props.onLeaveUpdated();
}
get canApprove() {
return !this.model.root.isNew && (this.record.can_approve && ['confirm', 'refuse',].includes(this.record.state));
return !this.model.root.isNew && (this.record.data.can_approve && ['confirm', 'refuse',].includes(this.record.data.state));
}
get canValidate() {
return !this.model.root.isNew && (this.record.can_approve && this.record.state === 'validate1');
return !this.model.root.isNew && (this.record.data.can_approve && this.record.data.state === 'validate1');
}
get canRefuse() {
return !this.model.root.isNew && (this.record.can_approve && this.record.state && ['confirm', 'validate1', 'validate'].includes(this.record.state));
return !this.model.root.isNew && (this.record.data.can_approve && this.record.data.state && ['confirm', 'validate1', 'validate'].includes(this.record.data.state));
}
deleteRecord() {
this.props.onRecordDeleted(this.record)
this.props.onRecordDeleted(this.record.data)
this.props.onCancelLeave();
if (this.record.can_cancel) {
this.leaveCancelWizard(this.record.id, () => {
if (this.record.data.can_cancel) {
this.leaveCancelWizard(this.record.resId, () => {
this.props.onLeaveCancelled();
});
}
}
get canDelete() {
return !this.model.root.isNew && (this.record.can_cancel || this.record.state && !['validate', 'refuse'].includes(this.record.state));
return !this.model.root.isNew && (this.record.data.can_cancel || this.record.data.state && !['validate', 'refuse'].includes(this.record.data.state));
}
}