diff --git a/bika/lims/browser/analysisrequest/templates/ar_add2.pt b/bika/lims/browser/analysisrequest/templates/ar_add2.pt index b7f8d543f0..b6698442ed 100644 --- a/bika/lims/browser/analysisrequest/templates/ar_add2.pt +++ b/bika/lims/browser/analysisrequest/templates/ar_add2.pt @@ -274,20 +274,23 @@

Request new analyses - - - - Reload Form - - +
+
+ + + +
+

diff --git a/bika/lims/browser/js/bika.lims.analysisrequest.add.js b/bika/lims/browser/js/bika.lims.analysisrequest.add.js index 77a290fdac..fef78c3c30 100644 --- a/bika/lims/browser/js/bika.lims.analysisrequest.add.js +++ b/bika/lims/browser/js/bika.lims.analysisrequest.add.js @@ -16,7 +16,6 @@ this.on_ajax_start = bind(this.on_ajax_start, this); this.ajax_post_form = bind(this.ajax_post_form, this); this.on_copy_button_click = bind(this.on_copy_button_click, this); - this.on_ar_count_change = bind(this.on_ar_count_change, this); this.on_service_category_click = bind(this.on_service_category_click, this); this.on_service_listing_header_click = bind(this.on_service_listing_header_click, this); this.on_reportdrymatter_click = bind(this.on_reportdrymatter_click, this); @@ -99,7 +98,6 @@ $("tr[fieldname=Profiles] input[type='text']").on("selected", this.on_analysis_profile_selected); $("tr[fieldname=Profiles] img.deletebtn").live("click", this.on_analysis_profile_removed); $("img.copybutton").on("click", this.on_copy_button_click); - $("#ar-count-control input[name=ar_count]").on("change", this.on_ar_count_change); /* internal events */ $(this).on("form:changed", this.recalculate_records); @@ -1089,24 +1087,6 @@ } }; - AnalysisRequestAdd.prototype.on_ar_count_change = function(event) { - - /* - * Eventhandler for ar_count number field - */ - var $el, ar_count, el, href, link, new_href; - el = event.target; - $el = $(el); - ar_count = $el.val(); - href = location.href; - if (href.search("ar_count") < 0) { - href += href.split('?')[1] ? '&ar_count=1' : '?ar_count=1'; - } - new_href = href.replace(/ar_count=[0-9]+/, "ar_count=" + ar_count); - link = $("#ar_count_change", $el.parent()); - return link.attr("href", new_href); - }; - AnalysisRequestAdd.prototype.on_copy_button_click = function(event) { /* diff --git a/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee b/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee index 4ef4de2678..f3615957fd 100644 --- a/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee +++ b/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee @@ -85,8 +85,6 @@ class window.AnalysisRequestAdd $("tr[fieldname=Profiles] img.deletebtn").live "click", @on_analysis_profile_removed # Copy button clicked $("img.copybutton").on "click", @on_copy_button_click - # AR Controls - $("#ar-count-control input[name=ar_count]").on "change", @on_ar_count_change ### internal events ### @@ -1214,23 +1212,6 @@ class window.AnalysisRequestAdd services.addClass "expanded" - on_ar_count_change: (event) => - ### - * Eventhandler for ar_count number field - ### - el = event.target - $el = $(el) - ar_count = $el.val() - href = location.href - # append ar_count to the url if it is missing - if href.search("ar_count") < 0 - href += if href.split('?')[1] then '&ar_count=1' else '?ar_count=1' - new_href = href.replace(/ar_count=[0-9]+/, "ar_count=#{ar_count}") - link = $("#ar_count_change", $el.parent()) - # set the new link - link.attr("href", new_href) - - on_copy_button_click: (event) => ### * Eventhandler for the field copy button per row. diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 97d62f5647..cfdffaf757 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,7 +1,7 @@ 3.2.1rc2 (unreleased) --------------------- -- No changes yet +- Issue-2214: AR Add Controls need to be styled correctly 3.2.1rc1 (2017-09-12)