diff --git a/pom.xml b/pom.xml index 07b96b6c8d..63329f4ce6 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 2 2 - 2 + 3 1 UTF-8 diff --git a/src/main/resources/languages/message_en.properties b/src/main/resources/languages/message_en.properties index c69784f662..426fecf0e4 100644 --- a/src/main/resources/languages/message_en.properties +++ b/src/main/resources/languages/message_en.properties @@ -6503,8 +6503,7 @@ test.modify.save.warning = You \ conti\ nue? test.modify.static.warning = Cance\ - lling\ - a \ + lling a \ test \ or \ delet\ @@ -6513,9 +6512,7 @@ test.modify.static.warning = Cance\ speci\ men \ for \ - which\ - resul\ - ts \ + which results \ have \ alrea\ dy \ diff --git a/src/main/webapp/pages/sample/sampleOrder.jsp b/src/main/webapp/pages/sample/sampleOrder.jsp index a9920a736c..54364d0e24 100644 --- a/src/main/webapp/pages/sample/sampleOrder.jsp +++ b/src/main/webapp/pages/sample/sampleOrder.jsp @@ -123,11 +123,11 @@ setCorrectSave(); } - function siteListChanged(textValue) { + function siteListChanged(siteList) { var siteList = $("requesterId"); - //if the index is 0 it is a new entry, if it is not then the textValue may include the index value - if (siteList.selectedIndex == 0 || siteList.options[siteList.selectedIndex].label != textValue) { + // create new entry has been removed gnr + if (siteList.selectedIndex == 0) { $("newRequesterName").value = textValue; } else if (useReferralSiteCode) { getCodeForOrganization(siteList.options[siteList.selectedIndex].value, processCodeSuccess); @@ -492,7 +492,8 @@ <% } %> -<% if( ConfigurationProperties.getInstance().isPropertyValueEqual( Property.USE_BILLING_REFERENCE_NUMBER, "true" )){ %> + +<% if( !ConfigurationProperties.getInstance().isPropertyValueEqual( Property.USE_BILLING_REFERENCE_NUMBER, "true" )){ %> @@ -560,8 +561,8 @@ invalidLabID = ''; // Alert if value is typed that's not on list. FIX - add bad message icon maxRepMsg = ''; - resultCallBack = function (textValue) { - siteListChanged(textValue); + resultCallBack = function (siteList) { + siteListChanged(siteList); setOrderModified(); setCorrectSave(); };