Yaron Koren has submitted this change and it was merged.
Change subject: Cargo field params should not override "values ..." params
......................................................................
Cargo field params should not override "values ..." params
Change-Id: Icd6701e4d72350fc785b67e0d7f4d60f24ffd010
---
M includes/forminputs/SF_TextWithAutocompleteInput.php
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/forminputs/SF_TextWithAutocompleteInput.php
b/includes/forminputs/SF_TextWithAutocompleteInput.php
index 7bb9d97..bfd15a2 100644
--- a/includes/forminputs/SF_TextWithAutocompleteInput.php
+++ b/includes/forminputs/SF_TextWithAutocompleteInput.php
@@ -62,12 +62,7 @@
public static function getAutocompletionTypeAndSource( &$field_args ) {
- if ( array_key_exists( 'cargo field', $field_args ) ) {
- $fieldName = $field_args['cargo field'];
- $tableName = $field_args['cargo table'];
- $autocompletionSource = "$tableName|$fieldName";
- $autocompleteFieldType = 'cargo field';
- } elseif ( array_key_exists( 'values from property',
$field_args ) ) {
+ if ( array_key_exists( 'values from property', $field_args ) ) {
$autocompletionSource = $field_args['values from
property'];
$autocompleteFieldType = 'property';
} elseif ( array_key_exists( 'values from category',
$field_args ) ) {
@@ -94,6 +89,11 @@
} elseif ( array_key_exists( 'full_cargo_field', $field_args )
) {
$autocompletionSource = $field_args['full_cargo_field'];
$autocompleteFieldType = 'cargo field';
+ } elseif ( array_key_exists( 'cargo field', $field_args ) ) {
+ $fieldName = $field_args['cargo field'];
+ $tableName = $field_args['cargo table'];
+ $autocompletionSource = "$tableName|$fieldName";
+ $autocompleteFieldType = 'cargo field';
} elseif ( array_key_exists( 'semantic_property', $field_args )
) {
$autocompletionSource =
$field_args['semantic_property'];
$autocompleteFieldType = 'property';
--
To view, visit https://gerrit.wikimedia.org/r/263231
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd6701e4d72350fc785b67e0d7f4d60f24ffd010
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
Gerrit-Reviewer: Yaron Koren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
