From a7fea618a7e5c86beb125b72862822780d2cbb2f Mon Sep 17 00:00:00 2001
From: Leonardo Vannucci <leonardo.vannucci@grupposistematica.it>
Date: Wed, 19 Sep 2018 17:44:17 +0200
Subject: [PATCH] fiz

---
 dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java |    2 +-
 dg1cloud-core/src/main/resources/templates/startURP.html                           |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java b/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java
index aecb5c9..301666f 100644
--- a/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java
+++ b/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java
@@ -193,7 +193,7 @@
 				if ( "text/plain".equalsIgnoreCase(allegato.getContentType()) == true ) {
 					dh = new DataHandler(new String(allegato.getBytes()), allegato.getContentType());
 				} else {
-					dh = new DataHandler(allegato.getBytes(), allegato.getContentType());
+					dh = new DataHandler(allegato.getBytes(), "application/octet-stream");
 				}
 				attachment.setData(dh);
 			} catch (IOException e) {
diff --git a/dg1cloud-core/src/main/resources/templates/startURP.html b/dg1cloud-core/src/main/resources/templates/startURP.html
index d7b85b3..1d814e8 100644
--- a/dg1cloud-core/src/main/resources/templates/startURP.html
+++ b/dg1cloud-core/src/main/resources/templates/startURP.html
@@ -67,10 +67,8 @@
 													th:text="${error}"></p>
 											</div>
 											<div class="form-group">
+												<div th:if="${#fields.hasErrors('reCaptchaResponse')}" th:text="'Errore validazione reCAPTCHA'" th:class="${'alert ' + alertClass}"></div>
 												<div class="g-recaptcha" th:attr="data-sitekey=${@captchaSettings.getKey()}"></div>
-												<p class="error-message"
-													th:each="error: ${#fields.errors('reCaptchaResponse')}"
-													th:text="'Errore validazione reCaptcha'"></p>
 											</div>
 											<div class="form-group">
 												<button name="Invia richiesta" type="submit" th:text="'Invia richiesta'"></button>

--
Gitblit v1.6.2