10000 [FW][FIX] mail: properly display activity create name and type name by fw-bot · Pull Request #210495 · odoo/odoo · GitHub
[go: up one dir, main page]
Skip to content

[FW][FIX] mail: properly display activity create name and type name #210495

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 1 commit into from
Closed

[FW][FIX] mail: properly display activity create name and type name #210495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions addons/mail/models/mail_activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,11 +612,11 @@ def activity_format(self):
def _to_store_defaults(self):
return [
"activity_category",
"activity_type_id",
Store.One("activity_type_id", "name"),
"can_write",
"chaining_type",
"create_date",
"create_uid",
Store.One("create_uid", "name"),
"date_deadline",
"date_done",
"icon",
Expand Down
8 changes: 8 additions & 0 deletions addons/mail/static/src/core/common/@types/models.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ declare module "models" {
import { Failure as FailureClass } from "@mail/core/common/failure_model";
import { Follower as FollowerClass } from "@mail/core/common/follower_model";
import { LinkPreview as LinkPreviewClass } from "@mail/core/common/link_preview_model";
import { MailActivityType as MailActivityTypeClass } from "@mail/core/common/mail_activity_type_model";
import { MailTemplate as MailTemplateClass } from "@mail/core/common/mail_template_model";
import { Message as MessageClass } from "@mail/core/common/message_model";
import { MessageLinkPreview as MessageLinkPreviewClass } from "@mail/core/common/message_link_preview_model";
Expand All @@ -20,6 +21,7 @@ declare module "models" {
import { ResGroups as ResGroupsClass } from "@mail/core/common/res_groups_model";
import { ResGroupsPrivilege as ResGroupsPrivilegeClass } from "@mail/core/common/res_groups_privilege_model";
import { ResRole as ResRoleClass } from "@mail/core/common/res_role_model";
import { ResUsers as ResUsersClass } from "@mail/core/common/res_users_model";
import { Settings as SettingsClass } from "@mail/core/common/settings_model";
import { Thread as ThreadClass } from "@mail/core/common/thread_model";
import { Volume as VolumeClass } from "@mail/core/common/volume_model";
Expand All @@ -36,6 +38,7 @@ declare module "models" {
export interface Failure extends FailureClass {}
export interface Follower extends FollowerClass {}
export interface LinkPreview extends LinkPreviewClass {}
export interface MailActivityType extends MailActivityTypeClass {}
export interface MailTemplate extends MailTemplateClass {}
export interface Message extends MessageClass {}
export interface MessageLinkPreview extends MessageLinkPreviewClass {}
Expand All @@ -45,6 +48,7 @@ declare module "models" {
export interface ResGroups extends ResGroupsClass {}
export interface ResGroupsPrivilege extends ResGroupsPrivilegeClass {}
export interface ResRole extends ResRoleClass {}
export interface ResUsers extends ResUsersClass {}
export interface Settings extends SettingsClass {}
export interface Thread extends ThreadClass {}
export interface Volume extends VolumeClass {}
Expand All @@ -58,6 +62,7 @@ declare module "models" {
Failure: StaticMailRecord<Failure, typeof FailureClass>;
"ir.attachment": StaticMailRecord<Attachment, typeof AttachmentClass>;
"mail.activity": StaticMailRecord<Activity, typeof ActivityClass>;
"mail.activity.type": StaticMailRecord<MailActivityType, typeof MailActivityTypeClass>;
"mail.canned.response": StaticMailRecord<CannedResponse, typeof CannedResponseClass>;
"mail.followers": StaticMailRecord<Follower, typeof FollowerClass>;
"mail.link.preview": StaticMailRecord<LinkPreview, typeof LinkPreviewClass>;
Expand All @@ -71,6 +76,7 @@ declare module "models" {
"res.groups": StaticMailRecord<ResGroups, typeof ResGroupsClass>;
"res.groups.privilege": StaticMailRecord<ResGroupsPrivilege, typeof ResGroupsPrivilegeClass>;
"res.role": StaticMailRecord<ResRole, typeof ResRoleClass>;
"res.users": StaticMailRecord<ResUsers, typeof ResUsersClass>;
Settings: StaticMailRecord<Settings, typeof SettingsClass>;
Thread: StaticMailRecord<Thread, typeof ThreadClass>;
Volume: StaticMailRecord<Volume, typeof VolumeClass>;
Expand All @@ -85,6 +91,7 @@ declare module "models" {
Failure: Failure;
"ir.attachment": Attachment;
"mail.activity": Activity;
"mail.activity.type": MailActivityType;
"mail.canned.response": CannedResponse;
"mail.followers": Follower;
"mail.link.preview": LinkPreview;
Expand All @@ -98,6 +105,7 @@ declare module "models" {
"res.groups": ResGroups;
"res.groups.privilege": ResGroupsPrivilege;
"res.role": ResRole;
"res.users": ResUsers;
Settings: Settings;
Thread: Thread;
Volume: Volume;
Expand Down
10 changes: 2 additions & 8 deletions addons/mail/static/src/core/common/activity_model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ export class Activity extends Record {
active;
/** @type {string} */
activity_category;
/** @type {[number, string]} */
activity_type_id;
activity_type_id = fields.One("mail.activity.type");
/** @type {string|false} */
activity_decoration;
/** @type {Object[]} */
Expand All @@ -40,8 +39,7 @@ export class Activity extends Record {
/** @type {'suggest'|'trigger'} */
chaining_type;
create_date = fields.Datetime();
/** @type {[number, string]} */
create_uid;
create_uid = fields.One("res.users");
date_deadline = fields.Date();
date_done = fields.Date();
/** @type {string} */
Expand All @@ -55,10 +53,6 @@ export class Activity extends Record {
mail_template_ids = fields.Many("mail.template");
note = fields.Html("");
persona = fields.One("Persona");
/** @type {number|false} */
previous_activity_type_id;
/** @type {number|false} */
recommended_activity_type_id;
/** @type {string} */
res_model;
/** @type {[number, string]} */
Expand Down
13 changes: 13 additions & 0 deletions addons/mail/static/src/core/common/mail_activity_type_model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Record } from "@mail/core/common/record";

export class MailActivityType extends Record {
static _name = "mail.activity.type";
static id = "id";

/** @type {number} */
id;
/** @type {string} */
name;
}

MailActivityType.register();
13 changes: 13 additions & 0 deletions addons/mail/static/src/core/common/res_users_model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Record } from "@mail/core/common/record";

export class ResUsers extends Record {
static _name = "res.users";
static id = "id";

/** @type {number} */
id;
/** @type {string} */
name;
}

ResUsers.register();
4 changes: 2 additions & 2 deletions addons/mail/static/src/core/web/activity.xml
View file
Open in desktop
57AE
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<div t-if="state.showDetails">
<table class="o-mail-Activity-details table table-sm mt-2">
<tbody>
<tr><td class="text-end fw-bolder">Activity type</td><td><t t-esc="props.activity.activity_type_id[1]"/></td></tr>
<tr><td class="text-end fw-bolder">Created</td><td><t t-esc="props.activity.dateCreateFormatted"/> by <t t-esc="props.activity.create_uid[1]"/></td></tr>
<tr><td class="text-end fw-bolder">Activity type</td><td><t t-esc="props.activity.activity_type_id?.name"/></td></tr>
<tr><td class="text-end fw-bolder">Created</td><td><t t-esc="props.activity.dateCreateFormatted"/> by <t t-esc="props.activity.create_uid?.name"/></td></tr>
<tr t-if="props.activity.persona"><td class="text-end fw-bolder">Assigned to</td><td><t t-esc="props.activity.persona.displayName"/></td></tr>
<tr><td class="text-end fw-bolder">Due on</td><td><t t-esc="props.activity.dateDeadlineFormatted"/></td></tr>
</tbody>
Expand Down
0