summaryrefslogtreecommitdiff
path: root/addons/mail
diff options
context:
space:
mode:
authorHiral Bhavsar <hbh@odoo.com>2019-02-13 13:00:19 +0000
committerXavier Morel <xmo@odoo.com>2019-06-17 11:34:17 +0000
commit3cd7ed07a29c89ddf193796c20a812b9bf21e284 (patch)
tree4d5ee7bbacec81a2254eb6f6f6a7cecf0a0d649c /addons/mail
parent3ab5612e4f5ec64ffa4a9b7cbf925af11a79a7fd (diff)
[IMP] *: remove 'view_type' on window actions.
The old tree views don't really exist anymore, this odd pseudo-flag to dispatch between "list" and "tree" tree views has no reason to remain. Task 1937686 closes odoo/odoo#31243 Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
Diffstat (limited to 'addons/mail')
-rw-r--r--addons/mail/controllers/main.py1
-rw-r--r--addons/mail/models/mail_activity.py1
-rw-r--r--addons/mail/models/mail_alias.py2
-rw-r--r--addons/mail/models/mail_template.py1
-rw-r--r--addons/mail/static/src/js/activity.js1
-rw-r--r--addons/mail/static/src/js/composers/chatter_composer.js1
-rw-r--r--addons/mail/static/src/js/followers.js2
-rw-r--r--addons/mail/static/src/js/services/mail_manager.js1
-rw-r--r--addons/mail/static/tests/activity_tests.js1
-rw-r--r--addons/mail/static/tests/chatter_tests.js1
-rw-r--r--addons/mail/views/mail_activity_views.xml2
-rw-r--r--addons/mail/views/mail_blacklist_views.xml1
-rw-r--r--addons/mail/views/mail_channel_views.xml2
-rw-r--r--addons/mail/views/mail_followers_views.xml1
-rw-r--r--addons/mail/views/mail_mail_views.xml1
-rw-r--r--addons/mail/views/mail_message_subtype_views.xml1
-rw-r--r--addons/mail/views/mail_message_views.xml1
-rw-r--r--addons/mail/views/mail_moderation_views.xml1
-rw-r--r--addons/mail/views/mail_template_views.xml1
-rw-r--r--addons/mail/views/mail_tracking_views.xml1
-rw-r--r--addons/mail/wizard/email_template_preview_view.xml1
-rw-r--r--addons/mail/wizard/mail_compose_message.py1
-rw-r--r--addons/mail/wizard/mail_compose_message_view.xml1
-rw-r--r--addons/mail/wizard/mail_resend_message_views.xml2
24 files changed, 0 insertions, 29 deletions
diff --git a/addons/mail/controllers/main.py b/addons/mail/controllers/main.py
index 39b7c53ddf5..3cd19d1bc8c 100644
--- a/addons/mail/controllers/main.py
+++ b/addons/mail/controllers/main.py
@@ -111,7 +111,6 @@ class MailController(http.Controller):
return cls._redirect_to_messaging()
url_params = {
- 'view_type': record_action['view_type'],
'model': model,
'id': res_id,
'active_id': res_id,
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 1f04378e601..0cd9edf1c18 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -429,7 +429,6 @@ class MailActivity(models.Model):
return {
'name': _('Schedule an Activity'),
'context': ctx,
- 'view_type': 'form',
'view_mode': 'form',
'res_model': 'mail.activity',
'views': [(False, 'form')],
diff --git a/addons/mail/models/mail_alias.py b/addons/mail/models/mail_alias.py
index 0045ea87989..8ae39131099 100644
--- a/addons/mail/models/mail_alias.py
+++ b/addons/mail/models/mail_alias.py
@@ -159,7 +159,6 @@ class Alias(models.Model):
if not self.alias_model_id or not self.alias_force_thread_id:
return False
return {
- 'view_type': 'form',
'view_mode': 'form',
'res_model': self.alias_model_id.model,
'res_id': self.alias_force_thread_id,
@@ -171,7 +170,6 @@ class Alias(models.Model):
if not self.alias_parent_model_id or not self.alias_parent_thread_id:
return False
return {
- 'view_type': 'form',
'view_mode': 'form',
'res_model': self.alias_parent_model_id.model,
'res_id': self.alias_parent_thread_id,
diff --git a/addons/mail/models/mail_template.py b/addons/mail/models/mail_template.py
index c2f601003d7..a334487f364 100644
--- a/addons/mail/models/mail_template.py
+++ b/addons/mail/models/mail_template.py
@@ -266,7 +266,6 @@ class MailTemplate(models.Model):
'name': button_name,
'type': 'ir.actions.act_window',
'res_model': 'mail.compose.message',
- 'view_type': 'form',
'context': "{'default_composition_mode': 'mass_mail', 'default_template_id' : %d, 'default_use_template': True}" % (template.id),
'view_mode': 'form,tree',
'view_id': view.id,
diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js
index 607f1b8c553..93c6ca58d1c 100644
--- a/addons/mail/static/src/js/activity.js
+++ b/addons/mail/static/src/js/activity.js
@@ -221,7 +221,6 @@ var BasicActivity = AbstractField.extend({
name: _t("Schedule Activity"),
res_model: 'mail.activity',
view_mode: 'form',
- view_type: 'form',
views: [[false, 'form']],
target: 'new',
context: {
diff --git a/addons/mail/static/src/js/composers/chatter_composer.js b/addons/mail/static/src/js/composers/chatter_composer.js
index 33c727a236d..c1ee1955dc9 100644
--- a/addons/mail/static/src/js/composers/chatter_composer.js
+++ b/addons/mail/static/src/js/composers/chatter_composer.js
@@ -297,7 +297,6 @@ var ChatterComposer = BasicComposer.extend({
type: 'ir.actions.act_window',
res_model: 'mail.compose.message',
view_mode: 'form',
- view_type: 'form',
views: [[false, 'form']],
target: 'new',
context: context,
diff --git a/addons/mail/static/src/js/followers.js b/addons/mail/static/src/js/followers.js
index 361041f20fe..2efcbd4692e 100644
--- a/addons/mail/static/src/js/followers.js
+++ b/addons/mail/static/src/js/followers.js
@@ -174,7 +174,6 @@ var Followers = AbstractField.extend({
type: 'ir.actions.act_window',
res_model: 'mail.wizard.invite',
view_mode: 'form',
- view_type: 'form',
views: [[false, 'form']],
name: _t("Invite Follower"),
target: 'new',
@@ -401,7 +400,6 @@ var Followers = AbstractField.extend({
var $target = $(ev.target);
this.do_action({
type: 'ir.actions.act_window',
- view_type: 'form',
view_mode: 'form',
res_model: $target.data('oe-model'),
views: [[false, 'form']],
diff --git a/addons/mail/static/src/js/services/mail_manager.js b/addons/mail/static/src/js/services/mail_manager.js
index dedeacca013..01397f6ab27 100644
--- a/addons/mail/static/src/js/services/mail_manager.js
+++ b/addons/mail/static/src/js/services/mail_manager.js
@@ -1036,7 +1036,6 @@ var MailManager = AbstractService.extend({
_redirectToDocument: function (resModel, resID, viewID) {
this.do_action({
type: 'ir.actions.act_window',
- view_type: 'form',
view_mode: 'form',
res_model: resModel,
views: [[viewID || false, 'form']],
diff --git a/addons/mail/static/tests/activity_tests.js b/addons/mail/static/tests/activity_tests.js
index fb5f3eda08f..6ab924973ec 100644
--- a/addons/mail/static/tests/activity_tests.js
+++ b/addons/mail/static/tests/activity_tests.js
@@ -435,7 +435,6 @@ QUnit.test('activity view: search more to schedule an activity for a record of a
target: "new",
type: "ir.actions.act_window",
view_mode: "form",
- view_type: "form",
views: [[false, "form"]],
};
assert.deepEqual(ev.data.action, expectedAction,
diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js
index 29df0733930..b68004f4218 100644
--- a/addons/mail/static/tests/chatter_tests.js
+++ b/addons/mail/static/tests/chatter_tests.js
@@ -1835,7 +1835,6 @@ QUnit.test('form activity widget: edit next activity', async function (assert) {
target: "new",
type: "ir.actions.act_window",
view_mode: "form",
- view_type: "form",
views: [
[
false,
diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml
index e5fcf98dc4b..6743b9beecf 100644
--- a/addons/mail/views/mail_activity_views.xml
+++ b/addons/mail/views/mail_activity_views.xml
@@ -85,7 +85,6 @@
<record id="mail_activity_type_action" model="ir.actions.act_window">
<field name="name">Activity Types</field>
<field name="res_model">mail.activity.type</field>
- <field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
@@ -98,7 +97,6 @@
<record id="mail_activity_action" model="ir.actions.act_window">
<field name="name">Activities</field>
<field name="res_model">mail.activity</field>
- <field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
diff --git a/addons/mail/views/mail_blacklist_views.xml b/addons/mail/views/mail_blacklist_views.xml
index 7b68c4cf7d3..1a98f20100e 100644
--- a/addons/mail/views/mail_blacklist_views.xml
+++ b/addons/mail/views/mail_blacklist_views.xml
@@ -50,7 +50,6 @@
<record id="mail_blacklist_action" model="ir.actions.act_window">
<field name="name">Blacklist</field>
<field name="res_model">mail.blacklist</field>
- <field name="view_type">form</field>
<field name="view_id" ref="mail_blacklist_view_tree"/>
<field name="search_view_id" ref="mail_blacklist_view_search"/>
<field name="help" type="html">
diff --git a/addons/mail/views/mail_channel_views.xml b/addons/mail/views/mail_channel_views.xml
index 4da8231e3e9..40911a053ff 100644
--- a/addons/mail/views/mail_channel_views.xml
+++ b/addons/mail/views/mail_channel_views.xml
@@ -35,7 +35,6 @@
<record id="mail_channel_partner_action" model="ir.actions.act_window">
<field name="name">Channels/Partner</field>
<field name="res_model">mail.channel.partner</field>
- <field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
@@ -183,7 +182,6 @@
<record id="mail_channel_action_view" model="ir.actions.act_window">
<field name="name">Join a group</field>
<field name="res_model">mail.channel</field>
- <field name="view_type">form</field>
<field name="view_mode">kanban,tree,form</field>
<field name="search_view_id" ref="mail_channel_view_search"/>
</record>
diff --git a/addons/mail/views/mail_followers_views.xml b/addons/mail/views/mail_followers_views.xml
index fa5cfbf0116..ebcf7d0e44a 100644
--- a/addons/mail/views/mail_followers_views.xml
+++ b/addons/mail/views/mail_followers_views.xml
@@ -40,7 +40,6 @@
<record id="action_view_followers" model="ir.actions.act_window">
<field name="name">Followers</field>
<field name="res_model">mail.followers</field>
- <field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
diff --git a/addons/mail/views/mail_mail_views.xml b/addons/mail/views/mail_mail_views.xml
index 3958dae10fc..2cdfe63da52 100644
--- a/addons/mail/views/mail_mail_views.xml
+++ b/addons/mail/views/mail_mail_views.xml
@@ -118,7 +118,6 @@
<record id="action_view_mail_mail" model="ir.actions.act_window">
<field name="name">Emails</field>
<field name="res_model">mail.mail</field>
- <field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="context">{}</field>
<field name="search_view_id" ref="view_mail_search"/>
diff --git a/addons/mail/views/mail_message_subtype_views.xml b/addons/mail/views/mail_message_subtype_views.xml
index 2672459e9d9..1f8eafeea94 100644
--- a/addons/mail/views/mail_message_subtype_views.xml
+++ b/addons/mail/views/mail_message_subtype_views.xml
@@ -45,7 +45,6 @@
<record model="ir.actions.act_window" id="action_view_message_subtype">
<field name="name">Subtypes</field>
<field name="res_model">mail.message.subtype</field>
- <field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Subtypes" id="menu_message_subtype" parent="base.menu_email" action="action_view_message_subtype"/>
diff --git a/addons/mail/views/mail_message_views.xml b/addons/mail/views/mail_message_views.xml
index b7ae76d8272..70657edd08c 100644
--- a/addons/mail/views/mail_message_views.xml
+++ b/addons/mail/views/mail_message_views.xml
@@ -123,7 +123,6 @@
<record id="action_view_mail_message" model="ir.actions.act_window">
<field name="name">Messages</field>
<field name="res_model">mail.message</field>
- <field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_message_search"/>
</record>
diff --git a/addons/mail/views/mail_moderation_views.xml b/addons/mail/views/mail_moderation_views.xml
index d1ad370660b..09ac3fbf0e0 100644
--- a/addons/mail/views/mail_moderation_views.xml
+++ b/addons/mail/views/mail_moderation_views.xml
@@ -37,7 +37,6 @@
<record id="mail_moderation_action" model="ir.actions.act_window">
<field name="name">Moderation</field>
<field name="res_model">mail.moderation</field>
- <field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="mail_moderation_view_search"/>
<field name="context">{'search_default_status_ban': 1}</field>
diff --git a/addons/mail/views/mail_template_views.xml b/addons/mail/views/mail_template_views.xml
index 81def4a35ae..5bac18dbbd5 100644
--- a/addons/mail/views/mail_template_views.xml
+++ b/addons/mail/views/mail_template_views.xml
@@ -128,7 +128,6 @@
<record model="ir.actions.act_window" id="action_email_template_tree_all">
<field name="name">Templates</field>
<field name="res_model">mail.template</field>
- <field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" ref="email_template_tree" />
<field name="search_view_id" ref="view_email_template_search"/>
diff --git a/addons/mail/views/mail_tracking_views.xml b/addons/mail/views/mail_tracking_views.xml
index f0ae084725d..170829427c3 100644
--- a/addons/mail/views/mail_tracking_views.xml
+++ b/addons/mail/views/mail_tracking_views.xml
@@ -63,7 +63,6 @@
<record model="ir.actions.act_window" id="action_view_mail_tracking_value">
<field name="name">Tracking Values</field>
<field name="res_model">mail.tracking.value</field>
- <field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Tracking Values" id="menu_mail_tracking_value" parent="base.menu_email" action="action_view_mail_tracking_value"/>
diff --git a/addons/mail/wizard/email_template_preview_view.xml b/addons/mail/wizard/email_template_preview_view.xml
index 29b67689d01..305c6e6223d 100644
--- a/addons/mail/wizard/email_template_preview_view.xml
+++ b/addons/mail/wizard/email_template_preview_view.xml
@@ -41,7 +41,6 @@
<field name="res_model">email_template.preview</field>
<field name="binding_model_id" ref="mail.model_mail_template"/>
<field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="email_template_preview_form"/>
<field name="target">new</field>
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index def7b58033b..18deb40800b 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -20,7 +20,6 @@ def _reopen(self, res_id, model, context=None):
context = dict(context or {}, default_model=model)
return {'type': 'ir.actions.act_window',
'view_mode': 'form',
- 'view_type': 'form',
'res_id': res_id,
'res_model': self._name,
'target': 'new',
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 4cc0db5cd2f..cee9c5a7d58 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -90,7 +90,6 @@
<field name="res_model">mail.compose.message</field>
<field name="binding_model_id" ref="mail.model_mail_compose_message"/>
<field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
diff --git a/addons/mail/wizard/mail_resend_message_views.xml b/addons/mail/wizard/mail_resend_message_views.xml
index 929cc2fa243..1ab5ea047f7 100644
--- a/addons/mail/wizard/mail_resend_message_views.xml
+++ b/addons/mail/wizard/mail_resend_message_views.xml
@@ -52,7 +52,6 @@
<field name="name">Resend mail</field>
<field name="res_model">mail.resend.message</field>
<field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
@@ -60,7 +59,6 @@
<field name="name">Discard mail delivery failures</field>
<field name="res_model">mail.resend.cancel</field>
<field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>