Merge pull request #196 from rossumg/develop

175812938, fix message, siteChange edit fix
I-TECH-UW · Dec 15, 2020 · efe53dc · efe53dc
2 parents 8cfebb9 + edef056
commit efe53dc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
 
 		<major.version>2</major.version>
 		<minor.version>2</minor.version>
-		<state.version>2</state.version><!-- 0 = alpha, 1 = beta, 2 = rc, 3 = deployable -->
+		<state.version>3</state.version><!-- 0 = alpha, 1 = beta, 2 = rc, 3 = deployable -->
 		<fix.version>1</fix.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git 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
@@ -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 @@
 </tr>
 <% } %>
 <tr>
-<% if( ConfigurationProperties.getInstance().isPropertyValueEqual( Property.USE_BILLING_REFERENCE_NUMBER, "true" )){ %>
+<!-- turn off for release 2.2.3.1 gnr -->
+<% if( !ConfigurationProperties.getInstance().isPropertyValueEqual( Property.USE_BILLING_REFERENCE_NUMBER, "true" )){ %>
     <td><label for="billingReferenceNumber">
     	<c:out value="${billingReferenceNumberLabel}"/>
     </label>
@@ -560,8 +561,8 @@
         invalidLabID = '<spring:message code="error.site.invalid"/>'; // Alert if value is typed that's not on list. FIX - add bad message icon
         maxRepMsg = '<spring:message code="sample.entry.project.siteMaxMsg"/>';
 
-        resultCallBack = function (textValue) {
-            siteListChanged(textValue);
+        resultCallBack = function (siteList) {
+            siteListChanged(siteList);
             setOrderModified();
             setCorrectSave();
         };