Skip to content

Master wowl aab #872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Master wowl aab #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9268c9
[REF] bus, calendar: services: use new start API
aab-odoo May 21, 2021
caf988c
[FIX] partner_autocomplete: call iap_enrich_auto at startup
aab-odoo May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions addons/bus/static/src/js/services/assets_watchdog_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import { browser } from "@web/core/browser/browser";
import { registry } from "@web/core/registry";

export const assetsWatchdogService = {
start(env) {
dependencies: ["notification"],

start(env, { notification }) {
const assets = {};
let assetsChangedNotificationId = null;
let bundleNotifTimerID = null;
Expand Down Expand Up @@ -32,7 +34,7 @@ export const assetsWatchdogService = {
// We wait until things settle down
browser.clearTimeout(bundleNotifTimerID);
bundleNotifTimerID = browser.setTimeout(() => {
assetsChangedNotificationId = env.services.notification.create(
assetsChangedNotificationId = notification.create(
env._t("The page appears to be out of date."),
{
title: env._t("Refresh"),
Expand Down
18 changes: 10 additions & 8 deletions addons/calendar/static/src/js/services/calendar_notification_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { ConnectionLostError } from "@web/core/network/rpc_service";
import { registry } from "@web/core/registry";

export const calendarNotificationService = {
start(env) {
dependencies: ["action", "notification", "rpc"],

start(env, { action, notification, rpc }) {
let calendarNotifTimeouts = {};
let nextCalendarNotifTimeout = null;
const calendarNotif = {};
Expand Down Expand Up @@ -40,7 +42,7 @@ export const calendarNotificationService = {
return;
}
calendarNotifTimeouts[key] = browser.setTimeout(function () {
const notificationID = env.services.notification.create(notif.message, {
const notificationID = notification.create(notif.message, {
title: notif.title,
type: "warning",
sticky: true,
Expand All @@ -52,26 +54,26 @@ export const calendarNotificationService = {
name: env._t("OK"),
primary: true,
onClick: async () => {
await env.services.rpc("/calendar/notify_ack");
env.services.notification.close(calendarNotif[key]);
await rpc("/calendar/notify_ack");
notification.close(calendarNotif[key]);
},
},
{
name: env._t("Details"),
onClick: async () => {
await env.services.action.doAction(
await action.doAction(
"calendar.action_calendar_event_notify",
{
resId: notif.event_id,
}
);
env.services.notification.close(calendarNotif[key]);
notification.close(calendarNotif[key]);
},
},
{
name: env._t("Snooze"),
onClick: () => {
env.services.notification.close(calendarNotif[key]);
notification.close(calendarNotif[key]);
},
},
],
Expand All @@ -92,7 +94,7 @@ export const calendarNotificationService = {

async function getNextCalendarNotif() {
try {
const result = await env.services.rpc("/calendar/notify", {}, { shadow: true });
const result = await rpc("/calendar/notify", {}, { shadow: true });
displayCalendarNotification(result);
} catch (error) {
if (!(error instanceof ConnectionLostError)) {
Expand Down
36 changes: 14 additions & 22 deletions addons/partner_autocomplete/static/src/js/web_company_autocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
// odoo.define('web.company_autocomplete', function (require) {
// "use strict";
/** @odoo-module **/

// const AbstractWebClient = require('web.AbstractWebClient');
// const session = require('web.session');
import { registry } from "@web/core/registry";

// return AbstractWebClient.include({
export const companyAutocompleteService = {
dependencies: ["orm", "user"],

// start: function () {
// if (session.iap_company_enrich) {
// const current_company_id = session.user_companies.current_company;
// this._rpc({
// model: 'res.company',
// method: 'iap_enrich_auto',
// args: [current_company_id],
// }, {
// shadow: true,
// });
// }
start(env, { orm, user }) {
if (odoo.session_info.iap_company_enrich) {
const currentCompanyId = user.current_company.id;
orm.call("res.company", "iap_enrich_auto", [currentCompanyId], {}, { shadow: true });
}
},
};

// return this._super.apply(this, arguments);
// },

// });

// });
registry
.category("services")
.add("partner_autocomplete.companyAutocomplete", companyAutocompleteService);