mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
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
This commit is contained in:
@@ -126,12 +126,12 @@ function validateRegex(control, expression, requiresMatch, matchMessage, noMatch
|
|||||||
function validateName(control, message, showMessage)
|
function validateName(control, message, showMessage)
|
||||||
{
|
{
|
||||||
var result = true;
|
var result = true;
|
||||||
var pattern = /[\"\*\\\>\<\?\/\:\|\%\&\+\;\xA3\xAC]+/;
|
var pattern = /([\"\*\\\>\<\?\/\:\|\xA3\xAC\%\&\+\;]+)|([ ]+$)|([\.]+$)/;
|
||||||
|
|
||||||
var idx = control.value.search(pattern);
|
var idx = control.value.search(pattern);
|
||||||
if (idx != -1)
|
if (idx != -1)
|
||||||
{
|
{
|
||||||
informUser(control, control.value.charAt(idx) + " " + message, showMessage);
|
informUser(control, "'" + control.value.charAt(idx) + "' " + message, showMessage);
|
||||||
result = false;
|
result = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user