composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support of non-case sensitive "forbidden values" in DesignerTextField

Browse Source 
SVN:trunk[4473]
This commit is contained in:
Denis Flaven
2016-11-04 15:58:59 +00:00
parent 79c5dc2ce2
commit a09e579451
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/forms.class.inc.php
View File

@@ -881,7 +881,7 @@ class DesignerTextField extends DesignerFormField
$this->sValidationPattern = $sValidationPattern;
}
public function SetForbiddenValues($aValues, $sExplain)
public function SetForbiddenValues($aValues, $sExplain, $bCaseSensitive = true)
{
$aForbiddenValues = $aValues;
@@ -893,7 +893,7 @@ class DesignerTextField extends DesignerFormField
}
$this->aForbiddenValues[] = array('values' => $aForbiddenValues, 'message' => $sExplain);
$this->aForbiddenValues[] = array('values' => $aForbiddenValues, 'message' => $sExplain, 'case_sensitive' => $bCaseSensitive);
}
public function Render(WebPage $oP, $sFormId, $sRenderMode='dialog')

21
js/property_field.js
View File

@@ -487,11 +487,24 @@ function ValidateWithPattern(sFieldId, bMandatory, sPattern, sFormId, aForbidden
{
for(j in aForbiddenValues[i].values)
{
if (aForbiddenValues[i].values[j] == currentVal)
if (aForbiddenValues[i].case_sensitive)
{
bValid = false;
sMessage = aForbiddenValues[i].message;
break;
if (aForbiddenValues[i].values[j] == currentVal)
{
bValid = false;
sMessage = aForbiddenValues[i].message;
break;
}
}
else
{
if (aForbiddenValues[i].values[j].toUpperCase() == currentVal.toUpperCase())
{
bValid = false;
sMessage = aForbiddenValues[i].message;
break;
}
}
}
}