From 5b68871097df5e7a13966dee4c650d1f34f9e7c1 Mon Sep 17 00:00:00 2001 From: Jorge Pinna Puissant Date: Fri, 9 Dec 2022 07:14:29 +0000 Subject: [PATCH] [IMP] * : kanban, unify dropdown definition in archs This commit separate the templates, one for the card and another one for the menu (the ellipsis dropdown). The new template, called 'kanban-menu', will only contain the dropdown. Note that, this behaviour is the same as the one used for the kanban tooltips. closes odoo/odoo#107589 Task-id: 3096776 Related: odoo/documentation#3284 Related: odoo/enterprise#34962 Signed-off-by: Aaron Bohy (aab) --- .../components/bills_upload/bills_upload.xml | 3 +- .../views/account_journal_dashboard_view.xml | 267 +++++++------- addons/crm/views/crm_lead_views.xml | 15 +- .../fleet/views/fleet_vehicle_model_views.xml | 11 +- addons/hr/views/hr_department_views.xml | 25 +- .../hr_contract/views/hr_contract_views.xml | 13 +- .../views/hr_leave_allocation_views.xml | 13 +- addons/hr_holidays/views/hr_leave_views.xml | 13 +- .../views/hr_applicant_views.xml | 17 +- addons/hr_recruitment/views/hr_job_views.xml | 93 +++-- .../views/hr_work_entry_views.xml | 11 +- addons/mail/views/mail_message_views.xml | 17 +- .../maintenance/views/maintenance_views.xml | 134 ++++--- .../views/mailing_mailing_views.xml | 25 +- addons/mrp/views/ir_attachment_view.xml | 15 +- addons/mrp/views/mrp_workcenter_views.xml | 76 ++-- addons/mrp/views/stock_picking_views.xml | 76 ++-- addons/note/views/note_views.xml | 13 +- .../views/point_of_sale_dashboard.xml | 62 ++-- .../tours/project_burndown_chart_tour.js | 2 +- .../tests/tours/project_sharing_tour.js | 2 +- .../project/views/project_sharing_views.xml | 15 +- addons/project/views/project_views.xml | 104 +++--- .../static/tests/tours/sale_timesheet_tour.js | 2 +- addons/sales_team/views/crm_team_views.xml | 62 ++-- .../stock/views/stock_picking_type_views.xml | 89 +++-- addons/survey/views/survey_survey_views.xml | 24 +- addons/utm/views/utm_campaign_views.xml | 25 +- .../src/views/kanban/kanban_arch_parser.js | 1 + .../src/views/kanban/kanban_compiler.js | 124 ------- .../src/views/kanban/kanban_controller.scss | 15 +- .../src/views/kanban/kanban_dashboard.scss | 188 +++++----- .../static/src/views/kanban/kanban_record.js | 12 +- .../static/src/views/kanban/kanban_record.xml | 17 + .../src/views/kanban/kanban_renderer.xml | 7 +- .../static/tests/views/kanban_view_tests.js | 342 +++--------------- .../views/event_track_views.xml | 18 +- .../views/slide_channel_views.xml | 35 +- odoo/addons/base/views/ir_module_views.xml | 17 +- 39 files changed, 759 insertions(+), 1241 deletions(-) diff --git a/addons/account/static/src/components/bills_upload/bills_upload.xml b/addons/account/static/src/components/bills_upload/bills_upload.xml index 96dbe78778b..a08f66c94e8 100644 --- a/addons/account/static/src/components/bills_upload/bills_upload.xml +++ b/addons/account/static/src/components/bills_upload/bills_upload.xml @@ -87,9 +87,10 @@ - + + diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml index 6133d3f9d5a..0ec768048fe 100644 --- a/addons/account/views/account_journal_dashboard_view.xml +++ b/addons/account/views/account_journal_dashboard_view.xml @@ -33,9 +33,6 @@ - @@ -52,9 +49,6 @@ -
- -
@@ -66,158 +60,161 @@ - + + + +
+ +
+ - -
-
-
- View +
+
+ New +
+ + +
- - - - -
- Journal Items + +
+
+ Reconciliation +
+
-
-
- New + +
+
+
+ View +
+
+ Invoices + Bills +
+ +
-
- Cust. Payment + + - -
- Internal Transfer + +
+
+ Reporting +
+
-
-
- Reconciliation + +
+
+
+ View +
+ + +
- -
-
- -
-
-
- View +
+
+ New +
+
-
- Invoices - Bills -
- -
- Journal Items + +
+
+ Operations +
+
-
-
- New -
- - -
- +
+
+
-
-
- Reporting + - - -
-
-
- View -
- - - -
- -
-
- New -
- -
- -
-
- Operations -
- -
-
- -
-
-
    -
-
- -
-
- -
- -
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index 9208ff7e8f9..289e4886818 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -554,6 +554,11 @@ sum_field="expected_revenue" recurring_revenue_sum_field="recurring_revenue_monthly" help="This bar allows to filter the opportunities based on scheduled activities."/> + + Edit + Delete +
    +
    @@ -562,16 +567,6 @@ Lost
    -
    diff --git a/addons/fleet/views/fleet_vehicle_model_views.xml b/addons/fleet/views/fleet_vehicle_model_views.xml index 19e420577ca..ca6f458b386 100644 --- a/addons/fleet/views/fleet_vehicle_model_views.xml +++ b/addons/fleet/views/fleet_vehicle_model_views.xml @@ -204,16 +204,11 @@ + + Configuration +
    -
    img
    diff --git a/addons/hr/views/hr_department_views.xml b/addons/hr/views/hr_department_views.xml index cb2cc231935..39055aab135 100644 --- a/addons/hr/views/hr_department_views.xml +++ b/addons/hr/views/hr_department_views.xml @@ -77,6 +77,17 @@ + +
    + +
    + Configuration +
    @@ -107,17 +115,6 @@
    -
    diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml index 518dfa45805..054b1be5c8b 100644 --- a/addons/hr_contract/views/hr_contract_views.xml +++ b/addons/hr_contract/views/hr_contract_views.xml @@ -288,17 +288,12 @@ + + Edit Contract + Delete +
    -
    diff --git a/addons/hr_holidays/views/hr_leave_allocation_views.xml b/addons/hr_holidays/views/hr_leave_allocation_views.xml index e4982e4b2d3..d2e99f7a972 100644 --- a/addons/hr_holidays/views/hr_leave_allocation_views.xml +++ b/addons/hr_holidays/views/hr_leave_allocation_views.xml @@ -358,6 +358,10 @@ + + Edit Allocation + Delete +
    @@ -373,15 +377,6 @@
    -
    diff --git a/addons/hr_holidays/views/hr_leave_views.xml b/addons/hr_holidays/views/hr_leave_views.xml index 69e07f033be..0758902de5c 100644 --- a/addons/hr_holidays/views/hr_leave_views.xml +++ b/addons/hr_holidays/views/hr_leave_views.xml @@ -106,6 +106,10 @@ + + Edit Time Off + Delete +
    @@ -115,15 +119,6 @@
    -
    from diff --git a/addons/hr_recruitment/views/hr_applicant_views.xml b/addons/hr_recruitment/views/hr_applicant_views.xml index a91490a12a1..3f2d745e710 100644 --- a/addons/hr_recruitment/views/hr_applicant_views.xml +++ b/addons/hr_recruitment/views/hr_applicant_views.xml @@ -318,6 +318,12 @@ + + Delete + Schedule Interview + +
      +
      @@ -325,17 +331,6 @@ Hired
      Refused -
      diff --git a/addons/hr_recruitment/views/hr_job_views.xml b/addons/hr_recruitment/views/hr_job_views.xml index e3b338e1864..5a20a8e04e9 100644 --- a/addons/hr_recruitment/views/hr_job_views.xml +++ b/addons/hr_recruitment/views/hr_job_views.xml @@ -26,6 +26,52 @@ + +
      +
      +
      + + + +
      + Trackers +
      +
      +
      + + +
      +
      + +
      + Analysis +
      +
      +
      +
      + + +
      +
      +
      @@ -44,9 +90,6 @@
      -
      - -
      @@ -77,50 +120,6 @@
      -
      diff --git a/addons/hr_work_entry/views/hr_work_entry_views.xml b/addons/hr_work_entry/views/hr_work_entry_views.xml index 74324151489..49d6934f758 100644 --- a/addons/hr_work_entry/views/hr_work_entry_views.xml +++ b/addons/hr_work_entry/views/hr_work_entry_views.xml @@ -195,16 +195,11 @@ + +
        +
        -
        diff --git a/addons/mail/views/mail_message_views.xml b/addons/mail/views/mail_message_views.xml index 51af0bc89e8..21c13604595 100644 --- a/addons/mail/views/mail_message_views.xml +++ b/addons/mail/views/mail_message_views.xml @@ -140,21 +140,12 @@ + + Download + Delete +
        -
        -
        - -
        -
        diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml index 8b8d1138d30..dc1d2afd047 100644 --- a/addons/maintenance/views/maintenance_views.xml +++ b/addons/maintenance/views/maintenance_views.xml @@ -137,19 +137,13 @@
      • Request to:
      + + Edit... + Delete + + + Edit... + Delete + + +
      diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml index e089c75eb03..d59996437e3 100644 --- a/addons/mass_mailing/views/mailing_mailing_views.xml +++ b/addons/mass_mailing/views/mailing_mailing_views.xml @@ -490,23 +490,18 @@ + +
    diff --git a/addons/mrp/views/stock_picking_views.xml b/addons/mrp/views/stock_picking_views.xml index 18106ed065c..a782f16fba2 100644 --- a/addons/mrp/views/stock_picking_views.xml +++ b/addons/mrp/views/stock_picking_views.xml @@ -11,6 +11,45 @@ + + +
    +
    +
    + +
    + All +
    + +
    + Planned +
    +
    +
    + + +
    +
    + +
    + + +
    +
    +
    +
    @@ -24,9 +63,6 @@
    -
    - -
    @@ -58,40 +94,6 @@
    -
    diff --git a/addons/note/views/note_views.xml b/addons/note/views/note_views.xml index 2512813ae7e..05e442a77a6 100644 --- a/addons/note/views/note_views.xml +++ b/addons/note/views/note_views.xml @@ -90,6 +90,10 @@ + + Delete +
      + @@ -97,15 +101,6 @@ -
      diff --git a/addons/point_of_sale/views/point_of_sale_dashboard.xml b/addons/point_of_sale/views/point_of_sale_dashboard.xml index 5034f8debad..2bfddd213c0 100644 --- a/addons/point_of_sale/views/point_of_sale_dashboard.xml +++ b/addons/point_of_sale/views/point_of_sale_dashboard.xml @@ -62,6 +62,37 @@ + +
      +
      +
      + +
      + Orders +
      +
      + Sessions +
      +
      +
      + +
      + Orders +
      +
      +
      + +
      + +
      +
      +
      @@ -85,9 +116,6 @@
      -
      - -
      @@ -130,34 +158,6 @@
      -
      diff --git a/addons/project/static/tests/tours/project_burndown_chart_tour.js b/addons/project/static/tests/tours/project_burndown_chart_tour.js index ddf60691836..804d62dddb2 100644 --- a/addons/project/static/tests/tours/project_burndown_chart_tour.js +++ b/addons/project/static/tests/tours/project_burndown_chart_tour.js @@ -10,7 +10,7 @@ tour.register('burndown_chart_tour', { trigger: '.o_app[data-menu-xmlid="project.menu_main_pm"]', }, { content: 'Open "Burndown Chart Test" project menu', - trigger: '.o_kanban_record:contains("Burndown Chart Test") .o_kanban_manage_toggle_button', + trigger: '.o_kanban_record:contains("Burndown Chart Test") .o_dropdown_kanban .dropdown-toggle', }, { content: `Open "Burndown Chart Test" project's "Burndown Chart" view`, trigger: '.o_kanban_record:contains("Burndown Chart Test") .o_kanban_manage_reporting div[role="menuitem"] a:contains("Burndown Chart")', diff --git a/addons/project/static/tests/tours/project_sharing_tour.js b/addons/project/static/tests/tours/project_sharing_tour.js index 0a0a83d1c0d..e22528aa7c3 100644 --- a/addons/project/static/tests/tours/project_sharing_tour.js +++ b/addons/project/static/tests/tours/project_sharing_tour.js @@ -3,7 +3,7 @@ import tour from 'web_tour.tour'; const projectSharingSteps = [...tour.stepUtils.goToAppSteps("project.menu_main_pm", 'Go to the Project App.'), { - trigger: '.oe_kanban_global_click :contains("Project Sharing") button.o_dropdown_kanban', + trigger: '.o_kanban_record:contains("Project Sharing") .o_dropdown_kanban .dropdown-toggle', content: 'Open the project dropdown.' }, { trigger: '.o_kanban_record:contains("Project Sharing") .dropdown-menu a:contains("Share")', diff --git a/addons/project/views/project_sharing_views.xml b/addons/project/views/project_sharing_views.xml index b63f777f5d4..4088cf05dbe 100644 --- a/addons/project/views/project_sharing_views.xml +++ b/addons/project/views/project_sharing_views.xml @@ -48,6 +48,11 @@ + + Edit + +
        +
        @@ -73,16 +78,6 @@
        -
        diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index 5b43abf9b12..956f43a26f7 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -829,6 +829,48 @@ + +
        +
        +
        + +
        + Tasks +
        + +
        +
        + + + +
        +
        +
        + + +
        + +
        +
        +
        +
        @@ -859,49 +901,6 @@
        - - - - @@ -1428,6 +1427,13 @@ + + Set Cover Image + Share + Edit + +
          +
          @@ -1453,18 +1459,6 @@
          -
          diff --git a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js index 9ee74ff37e5..07265bb6cb4 100644 --- a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js +++ b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js @@ -181,7 +181,7 @@ tour.register('sale_timesheet_tour', { trigger: '.dropdown-item[data-menu-xmlid="project.menu_main_pm"]', content: 'Select Project main menu', }, { - trigger: '.oe_kanban_global_click :contains("Project for Freeman") button.o_dropdown_kanban', + trigger: '.o_kanban_record:contains("Project for Freeman") .o_dropdown_kanban .dropdown-toggle', content: 'Open the project dropdown', }, { trigger: '.o_kanban_record:contains("Project for Freeman") .dropdown-menu a:contains("Settings")', diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml index 272ee299401..fa32107a5bf 100644 --- a/addons/sales_team/views/crm_team_views.xml +++ b/addons/sales_team/views/crm_team_views.xml @@ -151,15 +151,43 @@ + +
          +
          +
          + +
          +
          + +
          +
          + +
          +
          +
          + +
          + + +
          +
          +
          -
          - -
          @@ -177,34 +205,6 @@
          -
          diff --git a/addons/stock/views/stock_picking_type_views.xml b/addons/stock/views/stock_picking_type_views.xml index bea8dabdc59..e3b90803b9d 100644 --- a/addons/stock/views/stock_picking_type_views.xml +++ b/addons/stock/views/stock_picking_type_views.xml @@ -138,6 +138,50 @@ + +
          +
          +
          + +
          + All +
          +
          + Ready +
          +
          + Waiting +
          + +
          +
          + + + +
          +
          + +
          + + +
          +
          +
          @@ -152,9 +196,6 @@
          -
          - -
    @@ -198,48 +239,6 @@
    -
    diff --git a/addons/survey/views/survey_survey_views.xml b/addons/survey/views/survey_survey_views.xml index 1823c278ac1..7007f564c20 100644 --- a/addons/survey/views/survey_survey_views.xml +++ b/addons/survey/views/survey_survey_views.xml @@ -213,6 +213,14 @@ +
    + Edit Survey + Share + Delete +
    -