http://www.mediawiki.org/wiki/Special:Code/MediaWiki/60828
Revision: 60828
Author: yaron
Date: 2010-01-08 03:29:18 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
Switched order of 'if' clauses, to improve handling if there's a conflict
between template and form
Modified Paths:
--------------
trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc
Modified: trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc 2010-01-08
02:08:28 UTC (rev 60827)
+++ trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc 2010-01-08
03:29:18 UTC (rev 60828)
@@ -924,13 +924,13 @@
} else {
$sfgJSValidationCalls[] =
"validate_mandatory_field(\"input_$sfgFieldNum\", \"info_$sfgFieldNum\")";
}
- } elseif (($form_field->template_field->is_list &&
$form_field->template_field->field_type == 'enumeration' && $input_type !=
'listbox') || ($input_type == 'checkboxes')) {
- $sfgJSValidationCalls[] =
"validate_mandatory_checkboxes('$input_id', '$info_id')";
} elseif ($input_type == 'radiobutton' || $input_type ==
'category') {
// only add this if there's a "None" option
if (empty($default_value)) {
$sfgJSValidationCalls[] =
"validate_mandatory_radiobutton('$input_id', '$info_id')";
}
+ } elseif (($form_field->template_field->is_list &&
$form_field->template_field->field_type == 'enumeration' && $input_type !=
'listbox') || ($input_type == 'checkboxes')) {
+ $sfgJSValidationCalls[] =
"validate_mandatory_checkboxes('$input_id', '$info_id')";
} else {
$sfgJSValidationCalls[] =
"validate_mandatory_field('$input_id', '$info_id')";
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
