http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93203
Revision: 93203
Author: yaron
Date: 2011-07-26 16:33:55 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
Added handling of 'values' parameter, and of allowed values from property
Modified Paths:
--------------
trunk/extensions/SemanticForms/includes/forminputs/SF_ComboBoxInput.php
Modified:
trunk/extensions/SemanticForms/includes/forminputs/SF_ComboBoxInput.php
===================================================================
--- trunk/extensions/SemanticForms/includes/forminputs/SF_ComboBoxInput.php
2011-07-26 16:20:43 UTC (rev 93202)
+++ trunk/extensions/SemanticForms/includes/forminputs/SF_ComboBoxInput.php
2011-07-26 16:33:55 UTC (rev 93203)
@@ -56,7 +56,17 @@
list( $autocompleteFieldType, $autocompletionSource ) =
SFTextWithAutocompleteInput::getAutocompletionTypeAndSource( $other_args );
- $values = SFUtils::getAutocompleteValues(
$autocompletionSource, $autocompleteFieldType );
+
+ // @TODO - that count() check shouldn't be necessary
+ if ( array_key_exists( 'possible_values', $other_args ) &&
+ count( $other_args['possible_values'] ) > 0 ) {
+ $values = $other_args['possible_values'];
+ } elseif ( $autocompleteFieldType == 'values' ) {
+ $autocompleteValues = explode( ',',
$other_args['values'] );
+ } else {
+ $values = SFUtils::getAutocompleteValues(
$autocompletionSource, $autocompleteFieldType );
+ $autocompleteValues = SFUtils::getAutocompleteValues(
$autocompletionSource, $autocompleteFieldType );
+ }
$autocompletionSource = str_replace( "'", "\'",
$autocompletionSource );
$optionsText = Xml::element( 'option', array( 'value' =>
$cur_value ), null, false ) . "\n";
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
