minimal fixes for the 8.9.1

car031 · car031 · commit 4c4982fb1df3 · 2024-03-15T08:15:11.000+01:00
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/validators/SimpleTextValidator.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/validators/SimpleTextValidator.java
@@ -4,8 +4,7 @@
 import com.smartgwt.client.widgets.form.validator.RegExpValidator;
 
 /**
- * Tipical validator for codes, you can use only alfanumeric chars plus the
- * underscore
+ * Tipical validator for codes, you can use only alfanumeric chars plus the -
  * 
  * @author Marco Meschieri - LogicalDOC
  * @since 6.0
@@ -14,6 +13,6 @@ public class SimpleTextValidator extends RegExpValidator {
 	public SimpleTextValidator() {
 		super();
 		setErrorMessage(I18N.message("simpetextinvalid"));
-		setExpression("^([a-zA-Z0-9]+)$");
+		setExpression("^([a-zA-Z0-9 \\-]+)$");
 	}
 }
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/validators/TemplateNameTextValidator.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/validators/TemplateNameTextValidator.java
@@ -0,0 +1,18 @@
+package com.logicaldoc.gui.common.client.validators;
+
+import com.logicaldoc.gui.common.client.i18n.I18N;
+import com.smartgwt.client.widgets.form.validator.RegExpValidator;
+
+/**
+ * Tipical validator for tempalte names
+ * 
+ * @author Marco Meschieri - LogicalDOC
+ * @since 8.9.1
+ */
+public class TemplateNameTextValidator extends RegExpValidator {
+	public TemplateNameTextValidator() {
+		super();
+		setErrorMessage(I18N.message("tempaltenameinvalid"));
+		setExpression("^([a-zA-Z0-9]+)$");
+	}
+}
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/template/TemplatePropertiesPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/template/TemplatePropertiesPanel.java
@@ -15,6 +15,7 @@
 import com.logicaldoc.gui.common.client.util.ItemFactory;
 import com.logicaldoc.gui.common.client.util.LD;
 import com.logicaldoc.gui.common.client.util.Util;
+import com.logicaldoc.gui.common.client.validators.TemplateNameTextValidator;
 import com.logicaldoc.gui.frontend.client.services.AttributeSetService;
 import com.logicaldoc.gui.frontend.client.services.TemplateService;
 import com.smartgwt.client.types.PickerIconName;
@@ -694,6 +695,7 @@ private void prepareTemplateForm() {
 
 		TextItem name = ItemFactory.newSimpleTextItem("name", template.getName());
 		name.setRequired(true);
+		name.setValidators(new TemplateNameTextValidator());
 		name.setDisabled(template.isReadonly() || !template.isWrite());
 		if (!template.isReadonly() && template.isWrite())
 			name.addChangedHandler(changedHandler);
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages.properties b/logicaldoc-i18n/src/main/resources/i18n/messages.properties
@@ -3074,4 +3074,5 @@ department = Department
 sloenabled = Single Log Out enabled 
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
-candidates = Candidates
+candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_ar.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_ar.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_bg.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_bg.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_cs.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_cs.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_da.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_da.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_de.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_de.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_el.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_el.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_en.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_en.properties
@@ -3074,4 +3074,5 @@ department = Department
 sloenabled = Single Log Out enabled 
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
-candidates = Candidates
+candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_en_US.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_en_US.properties
@@ -3074,4 +3074,5 @@ department = Department
 sloenabled = Single Log Out enabled 
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
-candidates = Candidates
+candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_es.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_es.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out habilitado
 logoutrequestsigned = Las solicitudes de logout enviadas por este SP se cifrar\u00E1n
 logoutresponsesigned = Las respuestas de logout enviadas por este SP se cifrar\u00E1n
 candidates = Candidatos
+tempaltenameinvalid = Utilice \u00FAnicamente caracteres alfanum\u00E9ricos
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_fi.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_fi.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_fr.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_fr.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_hr.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_hr.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_hu.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_hu.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_id.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_id.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_it.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_it.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out abilitato
 logoutrequestsigned = Le richieste di logout inviate da questo SP verranno crittografate
 logoutresponsesigned = Le risposte di logout inviate da questo SP verranno crittografate
 candidates = Candidati
+tempaltenameinvalid = Usa unicamente caratteri alfanumerici
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_iw.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_iw.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_ja.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_ja.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_ko.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_ko.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_nl.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_nl.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_no.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_no.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_pl.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_pl.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_pt.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_pt.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_pt_BR.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_pt_BR.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_ro.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_ro.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_ru.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_ru.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_sl.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_sl.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_sv.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_sv.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_tr.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_tr.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_vi.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_vi.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages_zh_CN.properties b/logicaldoc-i18n/src/main/resources/i18n/messages_zh_CN.properties
@@ -3075,3 +3075,4 @@ sloenabled = Single Log Out enabled
 logoutrequestsigned = Log out requests sent by this SP will be encrypted
 logoutresponsesigned = Log out responses sent by this SP will be encrypted
 candidates = Candidates
+tempaltenameinvalid = Use alphanumeric chars only

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`	`import com.smartgwt.client.widgets.form.validator.RegExpValidator;`
`5`	`5`
`6`	`6`	`/**`
`7`		`- * Tipical validator for codes, you can use only alfanumeric chars plus the`
`8`		`- * underscore`
	`7`	`+ * Tipical validator for codes, you can use only alfanumeric chars plus the -`
`9`	`8`	`*`
`10`	`9`	`* @author Marco Meschieri - LogicalDOC`
`11`	`10`	`* @since 6.0`
`@@ -14,6 +13,6 @@ public class SimpleTextValidator extends RegExpValidator {`
`14`	`13`	`public SimpleTextValidator() {`
`15`	`14`	`super();`
`16`	`15`	`setErrorMessage(I18N.message("simpetextinvalid"));`
`17`		`- setExpression("^([a-zA-Z0-9]+)$");`
	`16`	`+ setExpression("^([a-zA-Z0-9 \\-]+)$");`
`18`	`17`	`}`
`19`	`18`	`}`