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

[FIX] calendar: show dialog when sync unconfigured

Browse Source 
## Issue

Currently if an administrator installs one of the sync modules but does
not set any credentials. If the user tries to sync their calendar
they are met with an error.

## Fix

Make sure they get a clear dialog explaining why they cannot sync.

task - 3056311

X-original-commit: 6ec6a3764c5e5460aa8a1cdfa228740606fdfe13
Part-of: odoo/odoo#106517
This commit is contained in:
Renaud Thiry
2022-11-25 17:56:31 +01:00
parent 13db30cba5
commit 53cad6f9f7
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/google_calendar/static/src/views/google_calendar/google_calendar_controller.js
+11 -9
View File
@@ -19,15 +19,17 @@ patch(AttendeeCalendarController.prototype, "google_calendar_google_calendar_con
[[this.user.userId]],
);
const syncResult = await this.model.syncGoogleCalendar();
if (syncResult.status === "need_auth") {
this.configureCalendarProviderSync("google");
} else if (syncResult.status === "need_config_from_admin") {
if (Number.isInteger(syncResult.action)) {
this.dialog.add(ConfirmationDialog, {
title: this.env._t("Configuration"),
body: this.env._t("The Google Synchronization needs to be configured before you can use it, do you want to do it now?"),
confirm: this.actionService.doAction.bind(this.actionService, syncResult.action),
});
if (["need_auth", "need_config_from_admin"].includes(syncResult.status)) {
if (this.isSystemUser) {
if (syncResult.status === "need_auth") {
this.configureCalendarProviderSync("google");
} else if (syncResult.status === "need_config_from_admin") {
this.dialog.add(ConfirmationDialog, {
title: this.env._t("Configuration"),
body: this.env._t("The Google Synchronization needs to be configured before you can use it, do you want to do it now?"),
confirm: this.actionService.doAction.bind(this.actionService, syncResult.action),
});
}
} else {
this.dialog.add(AlertDialog, {
title: this.env._t("Configuration"),
addons/microsoft_calendar/static/src/views/microsoft_calendar/microsoft_calendar_controller.js
+11 -9
View File
@@ -19,15 +19,17 @@ patch(AttendeeCalendarController.prototype, "microsoft_calendar_microsoft_calend
[[this.user.userId]],
);
const syncResult = await this.model.syncMicrosoftCalendar();
if (syncResult.status === "need_auth") {
this.configureCalendarProviderSync("microsoft");
} else if (syncResult.status === "need_config_from_admin") {
if (Number.isInteger(syncResult.action)) {
this.dialog.add(ConfirmationDialog, {
title: this.env._t("Configuration"),
body: this.env._t("The Outlook Synchronization needs to be configured before you can use it, do you want to do it now?"),
confirm: this.actionService.doAction.bind(this.actionService, syncResult.action),
});
if (["need_auth", "need_config_from_admin"].includes(syncResult.status)) {
if (this.isSystemUser) {
if (syncResult.status === "need_auth") {
this.configureCalendarProviderSync("microsoft");
} else if (syncResult.status === "need_config_from_admin") {
this.dialog.add(ConfirmationDialog, {
title: this.env._t("Configuration"),
body: this.env._t("The Outlook Synchronization needs to be configured before you can use it, do you want to do it now?"),
confirm: this.actionService.doAction.bind(this.actionService, syncResult.action),
});
}
} else {
this.dialog.add(AlertDialog, {
title: this.env._t("Configuration"),