Merge branch 'code-develop' into tuakiri-develop

* code-develop: Version: internal Tuakiri release 2.9.5-tuakiri4 fix: base/forms: prevent forms with single input text from wrongly submitting
REANNZ · Oct 8, 2021 · adca712 · adca712
2 parents ad6b652 + 2a57494
commit adca712
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/app/federationregistry/application.properties b/app/federationregistry/application.properties
@@ -3,4 +3,4 @@
 app.grails.version=2.5.6
 app.name=federationregistry
 app.servlet.version=3.0
-app.version=2.9.5-tuakiri3
+app.version=2.9.5-tuakiri4
diff --git a/app/plugins/base/grails-app/views/templates/acs/_list.gsp b/app/plugins/base/grails-app/views/templates/acs/_list.gsp
@@ -20,7 +20,7 @@
         <p>
           <g:message encodeAs="HTML" code="templates.fr.acs.reqattributes.add.details"/>
         </p>
-        <form id="newattributedata${acs.id}" class="form-horizontal validating">
+        <form id="newattributedata${acs.id}" class="form-horizontal validating" onsubmit="return false;">
           <fieldset>
             <div class="control-group">
               <label class="control-label" for="attrid"><g:message encodeAs="HTML" code="label.attribute"/></label>

diff --git a/app/plugins/base/grails-app/views/templates/attributes/_add.gsp b/app/plugins/base/grails-app/views/templates/attributes/_add.gsp
@@ -9,7 +9,7 @@
   <div id="new-attribute" class="revealable">
     <h3><g:message encodeAs="HTML" code="templates.fr.attributes.add.heading"/></h3>
 
-    <form id="newattributedata" class="form-horizontal">
+    <form id="newattributedata" class="form-horizontal" onsubmit="return false;">
       <div class="control-group">
         <label class="control-label" for="attributeID"><g:message encodeAs="HTML" code="label.attribute"/></label>
         <div class="controls">

diff --git a/app/plugins/base/grails-app/views/templates/certificates/_create.gsp b/app/plugins/base/grails-app/views/templates/certificates/_create.gsp
@@ -14,7 +14,7 @@
 
     <div id="newcertificatedetails"></div>
 
-    <form id="newcryptoform" class="form-horizontal">
+    <form id="newcryptoform" class="form-horizontal" onsubmit="return false;">
       <fieldset>
         <div class="control-group">
           <label class="control-label" for="certname"><g:message encodeAs="HTML" code="label.name"/></label>

diff --git a/app/plugins/base/grails-app/views/templates/endpoints/_create.gsp b/app/plugins/base/grails-app/views/templates/endpoints/_create.gsp
@@ -10,7 +10,7 @@
 
   <div id="new-${endpointType}" class="revealable">
     <h4><g:message encodeAs="HTML" code="templates.fr.endpoints.add.heading"/></h4>
-    <form id="new${endpointType}data" class="form-horizontal validating">
+    <form id="new${endpointType}data" class="form-horizontal validating" onsubmit="return false;">
       <fieldset>
         <input type="hidden"
  name="endpointType" value="${endpointType}">

diff --git a/app/plugins/base/grails-app/views/templates/endpoints/_edit.gsp b/app/plugins/base/grails-app/views/templates/endpoints/_edit.gsp
@@ -3,7 +3,7 @@
 
 <div id="endpoint-${endpoint.id}-editor">
   <h5><g:message encodeAs="HTML" code="label.editingendpoint"/> ${endpoint.id}</h5>
-  <form id="endpoint-edit-${endpoint.id}">
+  <form id="endpoint-edit-${endpoint.id}" onsubmit="return false;">
     <fieldset>
       <g:hiddenField name="id" value="${endpoint.id}" />
 

diff --git a/app/plugins/base/grails-app/views/templates/monitor/_create.gsp b/app/plugins/base/grails-app/views/templates/monitor/_create.gsp
@@ -9,7 +9,7 @@
 
   <div id="newmonitor" class="revealable">
     <h4><g:message encodeAs="HTML" code="templates.fr.monitor.add.heading"/></h4>
-    <form id="newmonitordata" class="form-horizontal">
+    <form id="newmonitordata" class="form-horizontal" onsubmit="return false;">
       <fieldset>
        <g:hiddenField name="interval" value="0" />