From 4072e336a296a8da873b2b69cfb00d379a41c67c Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Fri, 15 May 2015 11:14:46 +0200 Subject: [PATCH] [FIX] Cross-addons: Kanban templates: records editable/deletable for the sake of compatibility with the communication logic in the new Kanban implementation. --- .../account/views/account_journal_dashboard_view.xml | 2 +- addons/crm/crm_lead_view.xml | 4 ++-- addons/event/event_view.xml | 2 +- addons/hr/hr_dashboard.xml | 2 +- addons/hr_equipment/views/hr_equipment_views.xml | 8 ++++---- addons/hr_recruitment/hr_recruitment_dashboard.xml | 2 +- addons/hr_recruitment/hr_recruitment_view.xml | 2 +- addons/mass_mailing/views/email_template.xml | 6 +++--- addons/mass_mailing/views/mass_mailing.xml | 6 +++--- addons/project/project_dashboard.xml | 2 +- addons/project/project_view.xml | 4 ++-- addons/project_issue/project_issue_view.xml | 4 ++-- addons/sale_crm/sale_crm_view.xml | 8 ++++---- addons/sales_team/sales_team_dashboard.xml | 2 +- addons/stock/stock_dashboard.xml | 2 +- addons/survey/views/survey_views.xml | 4 ++-- addons/website/static/src/css/website.backend.css | 6 +++--- addons/website/static/src/js/website.backend.js | 9 ++++++--- addons/website/static/src/xml/website.backend.xml | 10 ++++------ addons/website_event_track/views/event_backend.xml | 4 ++-- addons/website_forum_doc/views/doc.xml | 4 ++-- 21 files changed, 47 insertions(+), 46 deletions(-) diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml index 78ccd40bcb7..5ebe9e36659 100644 --- a/addons/account/views/account_journal_dashboard_view.xml +++ b/addons/account/views/account_journal_dashboard_view.xml @@ -194,7 +194,7 @@
- Settings + Settings
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 42b20752a91..e1a17a245d0 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -307,8 +307,8 @@
    -
  • Edit Opportunity
  • -
  • Delete
  • +
  • Edit Opportunity
  • +
  • Delete
  • Send Email
  • Calls
  • Schedule Meeting
  • diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index ea53ba9f9b0..43091209ed0 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -165,7 +165,7 @@
      - +
    • Delete
      • diff --git a/addons/hr/hr_dashboard.xml b/addons/hr/hr_dashboard.xml index 884e0cbc68c..9567eda3ed7 100644 --- a/addons/hr/hr_dashboard.xml +++ b/addons/hr/hr_dashboard.xml @@ -47,7 +47,7 @@
-
+
  • diff --git a/addons/hr_equipment/views/hr_equipment_views.xml b/addons/hr_equipment/views/hr_equipment_views.xml index ef61997f586..9797223194d 100644 --- a/addons/hr_equipment/views/hr_equipment_views.xml +++ b/addons/hr_equipment/views/hr_equipment_views.xml @@ -92,8 +92,8 @@ @@ -265,8 +265,8 @@ diff --git a/addons/hr_recruitment/hr_recruitment_dashboard.xml b/addons/hr_recruitment/hr_recruitment_dashboard.xml index 75d4a4564a1..e0965de2039 100644 --- a/addons/hr_recruitment/hr_recruitment_dashboard.xml +++ b/addons/hr_recruitment/hr_recruitment_dashboard.xml @@ -123,7 +123,7 @@
    -
    +
  • diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index c3685c5f880..e0b9bcbbba4 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -268,7 +268,7 @@
      -
    • Delete
    • +
    • Delete
    • Schedule Interview
      diff --git a/addons/mass_mailing/views/email_template.xml b/addons/mass_mailing/views/email_template.xml index 73fb508b44b..5367e043383 100644 --- a/addons/mass_mailing/views/email_template.xml +++ b/addons/mass_mailing/views/email_template.xml @@ -50,11 +50,11 @@
      -
        - + diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml index 6b73230ca18..ce357f7a2f5 100644 --- a/addons/mass_mailing/views/mass_mailing.xml +++ b/addons/mass_mailing/views/mass_mailing.xml @@ -499,7 +499,7 @@
        @@ -787,10 +787,10 @@
          - +
        • Settings
        • - +
        • Delete
          • diff --git a/addons/project/project_dashboard.xml b/addons/project/project_dashboard.xml index 1e5ccbd13bc..b97e9721187 100644 --- a/addons/project/project_dashboard.xml +++ b/addons/project/project_dashboard.xml @@ -42,7 +42,7 @@ Cumulative Flow
        -
        +
      • diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 5861df6869a..e4e9a752fc6 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -363,8 +363,8 @@ diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index cd4675a1ae3..5b56a2568ff 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -168,8 +168,8 @@ diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index 3f63289c592..bd2f5e748d1 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -35,12 +35,12 @@ context="{'search_default_partner_id': partner_id, 'default_partner_id': partner_id}"> - diff --git a/addons/sales_team/sales_team_dashboard.xml b/addons/sales_team/sales_team_dashboard.xml index fa14cd91284..33e5a7062c5 100644 --- a/addons/sales_team/sales_team_dashboard.xml +++ b/addons/sales_team/sales_team_dashboard.xml @@ -47,7 +47,7 @@
        -
        +
      • diff --git a/addons/stock/stock_dashboard.xml b/addons/stock/stock_dashboard.xml index ddf35c7beb9..002a7fa3f87 100644 --- a/addons/stock/stock_dashboard.xml +++ b/addons/stock/stock_dashboard.xml @@ -100,7 +100,7 @@
        -
        +
      • diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml index 284de9fc4a9..df70a6b658e 100644 --- a/addons/survey/views/survey_views.xml +++ b/addons/survey/views/survey_views.xml @@ -184,11 +184,11 @@
        -
        + diff --git a/addons/website/static/src/css/website.backend.css b/addons/website/static/src/css/website.backend.css index 24879793303..91b3e7c01ea 100644 --- a/addons/website/static/src/css/website.backend.css +++ b/addons/website/static/src/css/website.backend.css @@ -1,7 +1,7 @@ -.oe_WidgetWebsiteButton.danger .oe_publish { - display: none; +.oe_stat_button .o_stat_info:not(.published) > .o_stat_text.oe_publish { + display: none; } -.oe_WidgetWebsiteButton.success .oe_unpublish { +.oe_stat_button .o_stat_info.published > .o_stat_text.oe_unpublish { display: none; } .oe_form_field_html_frame iframe { diff --git a/addons/website/static/src/js/website.backend.js b/addons/website/static/src/js/website.backend.js index b1920dc4cab..d1bb6c2f5b0 100644 --- a/addons/website/static/src/js/website.backend.js +++ b/addons/website/static/src/js/website.backend.js @@ -9,10 +9,13 @@ var form_widgets = require('web.form_widgets'); // required to guarantee that var WidgetWebsiteButton = form_common.AbstractField.extend({ template: 'WidgetWebsiteButton', render_value: function() { + // Hack to replace false value by unpublished because falsy form fields + // have classname o_form_field_empty and are hidden + if (!this.get_value()) { + this.set_value('unpublished'); + } this._super(); - this.$() - .toggleClass("success", this.get_value()) - .toggleClass("danger", !this.get_value()); + this.$el.toggleClass("published", this.get_value() === true); if (this.node.attrs.class) { this.$el.addClass(this.node.attrs.class); } diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml index 24f8c825816..826e29e261c 100644 --- a/addons/website/static/src/xml/website.backend.xml +++ b/addons/website/static/src/xml/website.backend.xml @@ -1,12 +1,10 @@ - -
        - Not
        Published
        - Published -
        -
        +
        + Not Published + Published +
        diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml index 7eb6a103d7d..09757cab38b 100644 --- a/addons/website_event_track/views/event_backend.xml +++ b/addons/website_event_track/views/event_backend.xml @@ -18,8 +18,8 @@
        diff --git a/addons/website_forum_doc/views/doc.xml b/addons/website_forum_doc/views/doc.xml index 9a32603fcab..f45243445b8 100644 --- a/addons/website_forum_doc/views/doc.xml +++ b/addons/website_forum_doc/views/doc.xml @@ -41,8 +41,8 @@