Merge branch 'nightlybuild' into feature/ms_proxy_service

2 files changed, 22 insertions, 3 deletions

diff --git a/basicConfig/ms-connector/templates/other_login_method.html b/basicConfig/ms-connector/templates/other_login_method.html
index 120b0ecd..d392a553 100644
--- a/basicConfig/ms-connector/templates/other_login_method.html
+++ b/basicConfig/ms-connector/templates/other_login_method.html
@@ -124,20 +124,33 @@
               <input type="hidden" name="loginSelection" value="EIDAS_LOGIN">
               <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
           </form>
-          <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+
+
+
+          <form th:if="${enableMatchingByAddressSearch != null} and ${enableMatchingByAddressSearch}"
+                method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
               <button class="primaryButton" type="submit" role="button" value="Keine weitere HS / eIDAS"
               	      th:text="#{gui.otherlogin.button.none}">C
               </button>
               <input type="hidden" name="loginSelection" value="NO_OTHER_LOGIN">
               <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
           </form>
+          <form th:unless="${enableMatchingByAddressSearch != null} and ${enableMatchingByAddressSearch}"
+                method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+              <button class="primaryButton" type="submit" role="button" value="Keine weitere HS / eIDAS"
+                      th:text="#{gui.otherlogin.button.none}">C
+              </button>
+              <input type="hidden" name="loginSelection" value="REQUESTING_NEW_ENTRY">
+              <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
+          </form>
+
         </div>
 
         <div  id="stopMatching" class="block">
           <!-- Abbrechen Button -->
           <form class="block,singleButton" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
               <button type="submit" value="Abbrechen/Cancel" th:text="#{gui.otherlogin.cancel}"></button>
-              <input type="hidden" name="stopAuthProcess" value="true">
+              <input type="hidden" name="loginSelection" value="STOP_MATCHING_PROCESS">
               <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
           </form>
         </div>
diff --git a/basicConfig/ms-connector/templates/residency.html b/basicConfig/ms-connector/templates/residency.html
index 26812ec0..de77269f 100644
--- a/basicConfig/ms-connector/templates/residency.html
+++ b/basicConfig/ms-connector/templates/residency.html
@@ -33,6 +33,7 @@
         function search() {
             let updatedText = /*[[#{gui.residency.updated}]]*/ 'Updated text';
             let errorText = /*[[#{gui.residency.error}]]*/ 'Error';
+            let emptyText = /*[[#{gui.residency.noentry}]]*/ 'Found {0}'
             let foundText = /*[[#{gui.residency.found}]]*/ 'Found {0}';
             let uniqueText = /*[[#{gui.residency.unique}]]*/ 'Unique';
             let invalidInputText = /*[[#{gui.residency.header.inputinvalid}]]*/ 'Invalid';
@@ -57,7 +58,12 @@
                     $("#inputForm #inputNumber").val(data["results"][0]["number"]);
                     return;
                 }
-                $("#textResult").show().text(foundText.replace("{0}", data["resultCount"]));
+
+                if (data["resultCount"] === 0) {
+                  $("#textResult").show().text(emptyText);
+                } else {
+                  $("#textResult").show().text(foundText.replace("{0}", data["resultCount"]));
+                }
                 $("#tableResult").show();
                 $("#tableResult tbody").empty();
                 $.each(data.results, function (i, output) {