From cfa7ffa439513eae435418639a32eb7dbf2052f7 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 19 Dec 2006 14:24:45 +0000
Subject: [PATCH] Merge 1.4 to HEAD    svn merge
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4340
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4350 .    svn resolved
 root\projects\3rd-party\.classpath    svn resolved
 root\projects\repository\source\java\org\alfresco\repo\workflow\WorkflowInterpreter.java
    svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4380 .    svn merge
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4420
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4421 .    svn resolved
 root\projects\3rd-party\.classpath

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/web/scripts/validation.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/web/scripts/validation.js b/source/web/scripts/validation.js
index be31a382e1..1d3dc53a5b 100644
--- a/source/web/scripts/validation.js
+++ b/source/web/scripts/validation.js
@@ -126,12 +126,12 @@ function validateRegex(control, expression, requiresMatch, matchMessage, noMatch
 function validateName(control, message, showMessage)
 {
    var result = true;
-   var pattern = /[\"\*\\\>\<\?\/\:\|\%\&\+\;\xA3\xAC]+/;
+   var pattern = /([\"\*\\\>\<\?\/\:\|\xA3\xAC\%\&\+\;]+)|([ ]+$)|([\.]+$)/;
    
    var idx = control.value.search(pattern);
    if (idx != -1)
    {
-      informUser(control, control.value.charAt(idx) + " " + message, showMessage);
+      informUser(control, "'" + control.value.charAt(idx) + "' " + message, showMessage);
       result = false;
    }