Yaron Koren has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/335185 )
Change subject: fixed interaction: mapping params & $wgPageFormsUseDisplayTitle
......................................................................
fixed interaction: mapping params & $wgPageFormsUseDisplayTitle
Change-Id: Ifa14df527255fc8cd2aab2b0fcb4ea48957053d8
---
M includes/PF_FormField.php
1 file changed, 15 insertions(+), 6 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
diff --git a/includes/PF_FormField.php b/includes/PF_FormField.php
index c006ff8..10f8a52 100644
--- a/includes/PF_FormField.php
+++ b/includes/PF_FormField.php
@@ -511,13 +511,16 @@
* given a mapping template.
*/
function setValuesWithMappingTemplate() {
- global $wgParser;
+ global $wgParser, $wgPageFormsUseDisplayTitle;
$labels = array();
$templateName = $this->mFieldArgs['mapping template'];
$title = Title::makeTitleSafe( NS_TEMPLATE, $templateName );
$templateExists = $title->exists();
- foreach ( $this->mPossibleValues as $value ) {
+ foreach ( $this->mPossibleValues as $index => $value ) {
+ if ( $wgPageFormsUseDisplayTitle ) {
+ $value = $index;
+ }
if ( $templateExists ) {
$label = trim( $wgParser->recursiveTagParse(
'{{' . $templateName .
'|' . $value . '}}' ) );
@@ -549,9 +552,13 @@
return;
}
+ global $wgPageFormsUseDisplayTitle;
$propertyName = $this->mFieldArgs['mapping property'];
$labels = array();
- foreach ( $this->mPossibleValues as $value ) {
+ foreach ( $this->mPossibleValues as $index => $value ) {
+ if ( $wgPageFormsUseDisplayTitle ) {
+ $value = $index;
+ }
$labels[$value] = $value;
$subject = Title::newFromText( $value );
if ( $subject != null ) {
@@ -569,8 +576,12 @@
* given a mapping Cargo table/field.
*/
function setValuesWithMappingCargoField() {
+ global $wgPageFormsUseDisplayTitle;
$labels = array();
- foreach ( $this->mPossibleValues as $value ) {
+ foreach ( $this->mPossibleValues as $index => $value ) {
+ if ( $wgPageFormsUseDisplayTitle ) {
+ $value = $index;
+ }
$labels[$value] = $value;
$vals = PFValuesUtils::getValuesForCargoField(
$this->mFieldArgs['mapping cargo table'],
@@ -647,8 +658,6 @@
}
}
}
-wfDebug("VALUES: " . print_r($values, true));
-wfDebug("LABELS: " . print_r($labels, true));
if ( count( $labels ) > 1 ) {
return $labels;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/335185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa14df527255fc8cd2aab2b0fcb4ea48957053d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Cicalese <cical...@mitre.org>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
