[REF] link_tracker: clean module views

Purpose is
 * to clean a bit views;
 * to improve link.tracker form view to have information better displayed;
 * to remove unused views;

This commit is linked to task ID 1896681 and PR #27975.

3 files changed, 56 insertions, 98 deletions

diff --git a/addons/link_tracker/models/link_tracker.py b/addons/link_tracker/models/link_tracker.py
index 81c2a03e465..c0147fe0e56 100644
--- a/addons/link_tracker/models/link_tracker.py
+++ b/addons/link_tracker/models/link_tracker.py
@@ -5,15 +5,14 @@ import base64
 import datetime
 import random
 import re
+import requests
 import string
 
-import requests
 from lxml import html
 from werkzeug import urls, utils
 
-
 from odoo import models, fields, api, _
-from odoo.tools import ustr
+
 
 URL_REGEX = r'(\bhref=[\'"](?!mailto:|tel:|sms:)([^\'"]+)[\'"])'
 
@@ -170,7 +169,7 @@ class LinkTracker(models.Model):
 
     @api.multi
     def action_view_statistics(self):
-        action = self.env['ir.actions.act_window'].for_xml_id('link_tracker', 'action_view_click_statistics')
+        action = self.env['ir.actions.act_window'].for_xml_id('link_tracker', 'link_tracker_click_action_statistics')
         action['domain'] = [('link_id', '=', self.id)]
         return action
 
diff --git a/addons/link_tracker/views/link_tracker_views.xml b/addons/link_tracker/views/link_tracker_views.xml
index 951bc2d8154..0ed9fe524c4 100644
--- a/addons/link_tracker/views/link_tracker_views.xml
+++ b/addons/link_tracker/views/link_tracker_views.xml
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record model="ir.actions.act_window" id="action_view_click_statistics">
-            <field name="name">Statistics of Clicks</field>
-            <field name="res_model">link.tracker.click</field>
-            <field name="view_mode">graph</field>
-            <field name="domain">[('link_id', 'IN', ids)]</field>
-        </record>
-
-        <!-- Search -->
-        <record id="view_link_tracker_filter" model="ir.ui.view">
-            <field name="name">Links</field>
+        <!-- LINT.TRACKER -->
+        <record id="link_tracker_view_search" model="ir.ui.view">
+            <field name="name">link.tracker.view.search</field>
             <field name="model">link.tracker</field>
             <field name="arch" type="xml">
-                <search string="Tracked Link">
-                    <field name="title"/>
+                <search string="Links">
                     <field name="url" string="Title and URL" filter_domain="['|', ('title', 'ilike', self), ('url', 'ilike', self)]"/>
+                    <field name="title"/>
                 </search>
             </field>
         </record>
 
-        <!-- Website links views -->
-        <record id="view_link_tracker_form" model="ir.ui.view">
-            <field name="name">link.tracker.form</field>
+        <record id="link_tracker_view_form" model="ir.ui.view">
+            <field name="name">link.tracker.view.form</field>
             <field name="model">link.tracker</field>
             <field name="arch" type="xml">
                 <form string="Website Link">
@@ -34,56 +26,29 @@
                             <button type="object" class="oe_stat_button" name="action_view_statistics" icon="fa-bar-chart-o">
                                 <field name="count" string="Clicks" widget="statinfo"/>
                             </button>
-
                         </div>
                         <group>
-                            <field name="title"/>
-                            <field name="url"/>
-                            <field name="short_url"/>
+                            <group name="url" string="URL">
+                                <field name="title"/>
+                                <field name="url"/>
+                                <field name="short_url"/>
+                            </group>
+                            <group name="utm" string="UTM">
+                                <field name="campaign_id"/>
+                                <field name="medium_id"/>
+                                <field name="source_id"/>
+                            </group>
                         </group>
-
-                        <group>
-                            <field name="campaign_id"/>
-                            <field name="medium_id"/>
-                            <field name="source_id"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-
-        <record id="view_link_tracker_form_stats" model="ir.ui.view">
-            <field name="name">link.tracker.my.form</field>
-            <field name="model">link.tracker</field>
-            <field name="arch" type="xml">
-                <form string="Website Link Graph">
-                    <sheet>
-                        <field name="link_click_ids">
-                            <graph>
-                                <field name="link_id"/>
-                                <field name="ip"/>
-                                <field name="country_id"/>
-                            </graph>
-                        </field>
                     </sheet>
                 </form>
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_link_tracker_stats">
-            <field name="name">link.tracker.form.graph.action</field>
-            <field name="res_model">link.tracker</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_link_tracker_form_stats"/>
-        </record>
-
-        <record id="view_link_tracker_tree" model="ir.ui.view">
-            <field name="name">link.tracker.tree</field>
+        <record id="link_tracker_view_tree" model="ir.ui.view">
+            <field name="name">link.tracker.view.tree</field>
             <field name="model">link.tracker</field>
             <field name="arch" type="xml">
-                <tree string="Website Links">
+                <tree string="Links">
                     <field name="create_date"/>
                     <field name="title"/>
                     <field name="url"/>
@@ -93,24 +58,23 @@
             </field>
         </record>
 
-        <record id="view_link_tracker_graph" model="ir.ui.view" >
-            <field name="name">link.tracker.graph</field>
+        <record id="link_tracker_view_graph" model="ir.ui.view">
+            <field name="name">link.tracker.view.graph</field>
             <field name="model">link.tracker</field>
             <field name="arch" type="xml">
-                <graph string="Website Links"  type="bar">
+                <graph string="Links" type="bar">
                     <field name="url" type="row"/>
                     <field name="count" type="measure"/>
                 </graph>
             </field>
         </record>
 
-        <!-- Action for website links-->
-        <record model="ir.actions.act_window" id="action_link_tracker">
+        <record id="link_tracker_action" model="ir.actions.act_window">
             <field name="name">Link Tracker</field>
             <field name="res_model">link.tracker</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="view_id" ref="view_link_tracker_tree"/>
+            <field name="view_id" ref="link_tracker_view_tree"/>
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">
                     Create a new link tracker
@@ -118,14 +82,12 @@
             </field>
         </record>
 
-        <!-- Website links click views -->
-        <record id="view_link_tracker_click_form" model="ir.ui.view">
-            <field name="name">link.tracker.click.form</field>
+        <!-- LINK.TRACKER.CLICK -->
+        <record id="link_tracker_click_view_form" model="ir.ui.view">
+            <field name="name">link.tracker.click.view.form</field>
             <field name="model">link.tracker.click</field>
             <field name="arch" type="xml">
-                <form string="Website Link Clicks">
-                    <header>
-                    </header>
+                <form string="Link Click">
                     <sheet>
                         <group>
                             <field name="link_id"/>
@@ -137,11 +99,11 @@
             </field>
         </record>
 
-        <record id="view_link_tracker_click_tree" model="ir.ui.view">
-            <field name="name">link.tracker.click.tree</field>
+        <record id="link_tracker_click_view_tree" model="ir.ui.view">
+            <field name="name">link.tracker.click.view.tree</field>
             <field name="model">link.tracker.click</field>
             <field name="arch" type="xml">
-                <tree string="Website Links Clicks">
+                <tree string="Links Clicks">
                     <field name="link_id"/>
                     <field name="ip"/>
                     <field name="country_id"/>
@@ -149,11 +111,11 @@
             </field>
         </record>
 
-        <record id="view_link_tracker_click_graph" model="ir.ui.view" >
-            <field name="name">link.tracker.click.graph</field>
+        <record id="link_tracker_click_view_graph" model="ir.ui.view">
+            <field name="name">link.tracker.click.view.graph</field>
             <field name="model">link.tracker.click</field>
             <field name="arch" type="xml">
-                <graph string="Website Link Clicks">
+                <graph string="Link Clicks">
                     <field name="link_id"/>
                     <field name="ip"/>
                     <field name="country_id"/>
@@ -161,8 +123,18 @@
             </field>
         </record>
 
-        <!-- Action for website links click-->
+        <record id="link_tracker_click_action_statistics" model="ir.actions.act_window">
+            <field name="name">Click Statistics</field>
+            <field name="res_model">link.tracker.click</field>
+            <field name="view_mode">graph</field>
+            <field name="domain">[]</field>
+        </record>
 
-        <menuitem id="menu_url_shortener_main" name="Link Tracker" parent="utm.menu_link_tracker_root" action="action_link_tracker" groups="base.group_no_one"/>
+        <!-- MENUS -->
+        <menuitem id="link_tracker_menu_main"
+            name="Link Tracker"
+            parent="utm.menu_link_tracker_root"
+            action="link_tracker_action"
+            groups="base.group_no_one"/>
     </data>
 </odoo>
diff --git a/addons/mass_mailing/views/link_tracker_views.xml b/addons/mass_mailing/views/link_tracker_views.xml
index f7ea013cefd..f2cb5985d35 100644
--- a/addons/mass_mailing/views/link_tracker_views.xml
+++ b/addons/mass_mailing/views/link_tracker_views.xml
@@ -1,28 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-	<!-- LINK TRACKER VIEWS -->
-    <record model="ir.ui.view" id="view_mail_mass_mailing_links_tree">
-        <field name="name">link.tracker.tree</field>
+	<!-- LINK.TRACKER VIEWS -->
+    <record id="link_tracker_view_search" model="ir.ui.view">
+        <field name="name">link.tracker.view.search.inherit.mass.mail</field>
         <field name="model">link.tracker</field>
-        <field name="priority">10</field>
+        <field name="inherit_id" ref="link_tracker.link_tracker_view_search"/>
         <field name="arch" type="xml">
-            <tree string="Mailing Statistics of Clicks">
-                <field name="title"/>
-                <field name="url"/>
-                <field name="count"/>
-            </tree>
-        </field>
-    </record>
-    
-    <record model="ir.ui.view" id="view_mail_mass_mailing_links_search">
-        <field name="name">link.tracker.search</field>
-        <field name="model">link.tracker</field>
-        <field name="inherit_id" ref="link_tracker.view_link_tracker_filter"/>
-        <field name="arch" type="xml">
-           <search>
+            <xpath expr="//field[@name='title']" position="after">
                 <field name="mass_mailing_id"/>
                 <field name="mass_mailing_campaign_id"/>
-            </search>
+            </xpath>
         </field>
     </record>