[IMP] web: hide group by option in search view for calendar view

odoo · Oct 16, 2017 · 69df0a3 · 69df0a3
1 parent 320fd28
commit 69df0a3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/addons/web/static/src/js/chrome/control_panel.js b/addons/web/static/src/js/chrome/control_panel.js
@@ -160,7 +160,7 @@ var ControlPanel = Widget.extend({
             this._attach_content(new_cp_content);
 
             // Update the searchview and switch buttons
-            this._update_search_view(status.searchview, status.search_view_hidden);
+            this._update_search_view(status.searchview, status.search_view_hidden, status.groupby_disable);
             if (status.active_view_selector) {
                 this._update_switch_buttons(status.active_view_selector);
             }
@@ -261,12 +261,15 @@ var ControlPanel = Widget.extend({
      * @param {openerp.web.SearchView} [searchview] the searchview Widget
      * @param {Boolean} [is_hidden] visibility of the searchview
      */
-    _update_search_view: function(searchview, is_hidden) {
+    _update_search_view: function (searchview, is_hidden, groupby_disable) {
         if (searchview) {
             // Set the $buttons div (in the DOM) of the searchview as the $buttons
             // have been appended to a jQuery node not in the DOM at SearchView initialization
             searchview.$buttons = this.nodes.$searchview_buttons;
             searchview.toggle_visibility(!is_hidden);
+            if (!searchview.options.disable_groupby){
+                groupby_disable ? searchview.groupby_menu.do_hide() : searchview.groupby_menu.do_show();
+            }
         }
 
         this.nodes.$searchview.toggle(!is_hidden);

diff --git a/addons/web/static/src/js/chrome/view_manager.js b/addons/web/static/src/js/chrome/view_manager.js
@@ -117,6 +117,7 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
                     groupBy: actionGroupBy,
                 }, self.flags, self.flags[view_type], view.options),
                 searchable: View.prototype.searchable,
+                groupby_disable: View.prototype.groupby_disable,
                 title: self.title,
                 type: view_type,
                 view_id: view[0] || view.view_id,
@@ -327,6 +328,7 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
             hidden: this.flags.headless,
             searchview: this.searchview,
             search_view_hidden: !this.active_view.searchable || this.active_view.searchview_hidden,
+            groupby_disable: this.active_view.groupby_disable
         };
         this.update_control_panel(cp_status);
 

diff --git a/addons/web/static/src/js/views/abstract_view.js b/addons/web/static/src/js/views/abstract_view.js
@@ -46,6 +46,8 @@ var AbstractView = Class.extend({
     // views are the form view and the diagram view.
     searchable: true,
 
+    // desable groupby option in search view.
+    groupby_disable: false,
     config: {
         Model: AbstractModel,
         Renderer: AbstractRenderer,

diff --git a/addons/web/static/src/js/views/calendar/calendar_view.js b/addons/web/static/src/js/views/calendar/calendar_view.js
@@ -28,6 +28,7 @@ var CalendarView = AbstractView.extend({
         Controller: CalendarController,
         Renderer: CalendarRenderer,
     },
+    groupby_disable: true,
     init: function (viewInfo, params) {
         this._super.apply(this, arguments);
         var arch = viewInfo.arch;