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

Fixed Trac #307: prevent form submission when the value typed into an autocomplete field does not correspond to a valid value.

Browse Source 
SVN:trunk[930]
This commit is contained in:
Denis Flaven
2010-10-26 08:12:31 +00:00
parent 05a2443afe
commit 0b95b3799e
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/cmdbabstract.class.inc.php
View File

@@ -1128,7 +1128,7 @@ EOF
$sHTMLValue .= "<input type=\"hidden\" id=\"$iId\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" value=\"$value\" />\n";
$oPage->add_ready_script("\$('#label_$iId').autocomplete('./ajax.render.php', { scroll:true, minChars:3, onItemSelect:selectItem, onFindValue:findValue, formatItem:formatItem, autoFill:true, keyHolder:'#$iId', extraParams:{operation:'autocomplete', sclass:'$sClass',attCode:'".$sAttCode."'}});");
$oPage->add_ready_script("\$('#label_$iId').blur(function() { $(this).search(); } );");
$oPage->add_ready_script("\$('#label_$iId').result( function(event, data, formatted) { if (data) { $('#{$iId}').val(data[1]); $('#{$iId}').trigger('change'); } else { $('#{$iId}').val(''); $('#{$iId}').trigger('change');} } );");
$oPage->add_ready_script("\$('#label_$iId').result( function(event, data, formatted) { OnAutoComplete('$iId', event, data, formatted); } );");
$aEventsList[] ='change';
}
else

2
css/jquery.autocomplete.css
View File

@@ -35,7 +35,7 @@
}
.ac_loading {
background: white url('indicator.gif') right center no-repeat;
background: white url('../images/indicator.gif') right center no-repeat;
}
.ac_odd {

29
js/forms-json-utils.js
View File

@@ -154,7 +154,11 @@ function ValidateField(sFieldId, sPattern, bMandatory, sFormId, nullValue)
{
var bValid = true;
var currentVal = $('#'+sFieldId).val();
if (bMandatory && (currentVal == nullValue))
if (currentVal == '$$NULL$$') // Convention to indicate a non-valid value since it may have to be passed as text
{
bValid = false;
}
else if (bMandatory && (currentVal == nullValue))
{
bValid = false;
}
@@ -248,3 +252,26 @@ function ValidatePasswordField(id, sFormId)
$('#v_'+id).html(''); //<img src="../images/validation_ok.png" />');
return true;
}
// Called when filling an autocomplete field
function OnAutoComplete(id, event, data, formatted)
{
if (data)
{
// A valid match was found: data[0] => label, data[1] => value
$('#'+id).val(data[1]);
$('#'+id).trigger('change');
}
else
{
if ($('#label_'+id).val() == '')
{
$('#'+id).val(''); // Empty value
}
else
{
$('#'+id).val('$$NULL$$'); // Convention: not a valid value
}
$('#'+id).trigger('change');
}
}