8000 [FIX] mail: properly display activity create name and type name · odoo/odoo@8937b3e · GitHub
[go: up one dir, main page]

Skip to content

Commit 8937b3e

Browse files
committed
[FIX] mail: properly display activity create name and type name
Follow up of #189598 Follow up of #210060 task-4794562
1 parent 768b28a commit 8937b3e

File tree

6 files changed

+40
-12
lines changed

6 files changed

+40
-12
lines changed

addons/mail/models/mail_activity.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,11 +612,11 @@ def activity_format(self):
612612
def _to_store_defaults(self):
613613
return [
614614
"activity_category",
615-
"activity_type_id",
615+
Store.One("activity_type_id", "name"),
616616
"can_write",
617617
"chaining_type",
618618
"create_date",
619-
"create_uid",
619+
Store.One("create_uid", "name"),
620620
"date_deadline",
621621
"date_done",
622622
"icon",

addons/mail/static/src/core/common/@types/models.d.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ declare module "models" {
1111
import { Failure as FailureClass } from "@mail/core/common/failure_model";
1212
import { Follower as FollowerClass } from "@mail/core/common/follower_model";
1313
import { LinkPreview as LinkPreviewClass } from "@mail/core/common/link_preview_model";
14+
import { MailActivityType as MailActivityTypeClass } from "@mail/core/common/mail_activity_type_model";
1415
import { MailTemplate as MailTemplateClass } from "@mail/core/common/mail_template_model";
1516
import { Message as MessageClass } from "@mail/core/common/message_model";
1617
import { MessageLinkPreview as MessageLinkPreviewClass } from "@mail/core/common/message_link_preview_model";
@@ -20,6 +21,7 @@ declare module "models" {
2021
import { ResGroups as ResGroupsClass } from "@mail/core/common/res_groups_model";
2122
import { ResGroupsPrivilege as ResGroupsPrivilegeClass } from "@mail/core/common/res_groups_privilege_model";
2223
import { ResRole as ResRoleClass } from "@mail/core/common/res_role_model";
24+
import { ResUsers as ResUsersClass } from "@mail/core/common/res_users_model";
2325
import { Settings as SettingsClass } from "@mail/core/common/settings_model";
2426
import { Thread as ThreadClass } from "@mail/core/common/thread_model";
2527
import { Volume as VolumeClass } from "@mail/core/common/volume_model";
@@ -36,6 +38,7 @@ declare module "models" {
3638
export interface Failure extends FailureClass {}
3739
export interface Follower extends FollowerClass {}
3840
export interface LinkPreview extends LinkPreviewClass {}
41+
export interface MailActivityType extends MailActivityTypeClass {}
3942
export interface MailTemplate extends MailTemplateClass {}
4043
export interface Message extends MessageClass {}
4144
export interface MessageLinkPreview extends MessageLinkPreviewClass {}
@@ -45,6 +48,7 @@ declare module "models" {
4548
export interface ResGroups extends ResGroupsClass {}
4649
export interface ResGroupsPrivilege extends ResGroupsPrivilegeClass {}
4750
export interface ResRole extends ResRoleClass {}
51+
export interface ResUsers extends ResUsersClass {}
4852
export interface Settings extends SettingsClass {}
4953
export interface Thread extends ThreadClass {}
5054
export interface Volume extends VolumeClass {}
@@ -58,6 +62,7 @@ declare module "models" {
5862
Failure: StaticMailRecord<Failure, typeof FailureClass>;
5963
"ir.attachment": StaticMailRecord<Attachment, typeof AttachmentClass>;
6064
"mail.activity": StaticMailRecord<Activity, typeof ActivityClass>;
65+
"mail.activity.type": StaticMailRecord<MailActivityType, typeof MailActivityTypeClass>;
6166
"mail.canned.response": StaticMailRecord<CannedResponse, typeof CannedResponseClass>;
6267
"mail.followers": StaticMailRecord<Follower, typeof FollowerClass>;
6368
"mail.link.preview": StaticMailRecord<LinkPreview, typeof LinkPreviewClass>;
@@ -71,6 +76,7 @@ declare module "models" {
7176
"res.groups": StaticMailRecord<ResGroups, typeof ResGroupsClass>;
7277
"res.groups.privilege": StaticMailRecord<ResGroupsPrivilege, typeof ResGroupsPrivilegeClass>;
7378
"res.role": StaticMailRecord<ResRole, typeof ResRoleClass>;
79+
"res.users": StaticMailRecord<ResUsers, typeof ResUsersClass>;
7480
Settings: StaticMailRecord<Settings, typeof SettingsClass>;
7581
Thread: StaticMailRecord<Thread, typeof ThreadClass>;
7682
Volume: StaticMailRecord<Volume, typeof VolumeClass>;
@@ -85,6 +91,7 @@ declare module "models" {
8591
Failure: Failure;
8692
"ir.attachment": Attachment;
8793
"mail.activity": Activity;
94+
"mail.activity.type": MailActivityType;
8895
"mail.canned.response": CannedResponse;
8996
"mail.followers": Follower;
9097
"mail.link.preview": LinkPreview;
@@ -98,6 +105,7 @@ declare module "models" {
98105
"res.groups": ResGroups;
99106
"res.groups.privilege": ResGroupsPrivilege;
100107
"res.role": ResRole;
108+
"res.users": ResUsers;
101109
Settings: Settings;
102110
Thread: Thread;
103111
Volume: Volume;

addons/mail/static/src/core/common/activity_model.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ export class Activity extends Record {
2929
active;
3030
/** @type {string} */
3131
activity_category;
32-
/** @type {[number, string]} */
33-
activity_type_id;
32+
activity_type_id = fields.One("mail.activity.type");
3433
/** @type {string|false} */
3534
activity_decoration;
3635
/** @type {Object[]} */
@@ -40,8 +39,7 @@ export class Activity extends Record {
4039
/** @type {'suggest'|'trigger'} */
4140
chaining_type;
4241
create_date = fields.Datetime();
43-
/** @type {[number, string]} */
44-
create_uid;
42+
create_uid = fields.One("res.users");
4543
date_deadline = fields.Date();
4644
date_done = fields.Date();
4745
/** @type {string} */
@@ -55,10 +53,6 @@ export class Activity extends Record {
5553
mail_template_ids = fields.Many("mail.template");
5654
note = fields.Html("");
5755
persona = fields.One("Persona");
58-
/** @type {number|false} */
59-
previous_activity_type_id;
60-
/** @type {number|false} */
61-
recommended_activity_type_id;
6256
/** @type {string} */
6357
res_model;
6458
/** @type {[number, string]} */
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Record } from "@mail/core/common/record";
2+
3+
export class MailActivityType extends Record {
4+
static _name = "mail.activity.type";
5+
static id = "id";
6+
7+
/** @type {number} */
8+
id;
9+
/** @type {string} */
10+
name;
11+
}
12+
13+
MailActivityType.register();
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Record } from "@mail/core/common/record";
2+
3+
export class ResUsers extends Record {
4+
static _name = "res.users";
5+
static id = "id";
6+
7+
/** @type {number} */
8+
id;
9+
/** @type {string} */
10+
name;
11+
}
12+
13+
ResUsers.register();

addons/mail/static/src/core/web/activity.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<div t-if="state.showDetails">
3838
<table class="o-mail-Activity-details table table-sm mt-2">
3939
<tbody>
40-
<tr><td class="text-end fw-bolder">Activity type</td><td><t t-esc="props.activity.activity_type_id[1] 6506 "/></td></tr>
41-
<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>
40+
<tr><td class="text-end fw-bolder">Activity type</td><td><t t-esc="props.activity.activity_type_id?.name"/></td></tr>
41+
<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>
4242
<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>
4343
<tr><td class="text-end fw-bolder">Due on</td><td><t t-esc="props.activity.dateDeadlineFormatted"/></td></tr>
4444
</tbody>

0 commit comments

Comments
 (0)
0