diff --git a/CHANGES.rst b/CHANGES.rst index 3ea6295c3d..e45ab4e234 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -15,6 +15,7 @@ Changelog **Fixed** +- #706 Filtering by Department is not working - #712 Dates in date picker are visible again - #703 Containers of Duplicated Analyses are not found - #698 Fix Publish Actions for Batches diff --git a/bika/lims/browser/js/bika.lims.site.js b/bika/lims/browser/js/bika.lims.site.js index 61ceacfa21..5087b2905c 100644 --- a/bika/lims/browser/js/bika.lims.site.js +++ b/bika/lims/browser/js/bika.lims.site.js @@ -57,11 +57,11 @@ this.init_client_combogrid(); this.init_datepickers(); this.init_referencedefinition(); + this.department_filter_cookie = "filter_by_department_info"; + this.department_filter_disabled_cookie = "dep_filter_disabled"; this.init_department_filtering(); this.bind_eventhandler(); - this.allowed_keys = [8, 9, 13, 35, 36, 37, 39, 46, 44, 60, 62, 45, 69, 101, 61]; - this.department_filter_cookie = "filter_by_department_info"; - return this.department_filter_disabled_cookie = "dep_filter_disabled"; + return this.allowed_keys = [8, 9, 13, 35, 36, 37, 39, 46, 44, 60, 62, 45, 69, 101, 61]; }; diff --git a/bika/lims/browser/js/coffee/bika.lims.site.coffee b/bika/lims/browser/js/coffee/bika.lims.site.coffee index d4a6b8e269..b4c7b7c20b 100644 --- a/bika/lims/browser/js/coffee/bika.lims.site.coffee +++ b/bika/lims/browser/js/coffee/bika.lims.site.coffee @@ -27,7 +27,12 @@ class window.SiteView # initialze reference definition selection @init_referencedefinition() - # initialze department filtering + # Department Filtering + # The name of the department filter cookies + @department_filter_cookie = "filter_by_department_info" + @department_filter_disabled_cookie = "dep_filter_disabled" + + # initialize department filtering @init_department_filtering() # bind the event handler to the elements @@ -52,11 +57,6 @@ class window.SiteView 61 # = ] - # The name of the department filter cookies - @department_filter_cookie = "filter_by_department_info" - @department_filter_disabled_cookie = "dep_filter_disabled" - - ### INITIALIZERS ### bind_eventhandler: =>