Revision: 43611
Author: mkroetzsch
Date: 2008-11-17 17:28:35 +0000 (Mon, 17 Nov 2008)
Log Message:
-----------
Fix to print property labels correctly in query results (Bug 16304)
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Property.php
trunk/extensions/SemanticMediaWiki/includes/storage/SMW_Description.php
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Property.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Property.php
2008-11-17 17:26:26 UTC (rev 43610)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Property.php
2008-11-17 17:28:35 UTC (rev 43611)
@@ -131,6 +131,13 @@
}
}
+ public function setCaption($caption) {
+ parent::setCaption($caption);
+ if ($this->m_wikipage instanceof SMWDataValue) { // pass
caption to embedded datavalue (used for printout)
+ $this->m_wikipage->setCaption($caption);
+ }
+ }
+
/**
* Return TRUE if this is a usual wiki property that is defined by a
wiki page, as
* opposed to a property that is pre-defined in the wiki.
Modified:
trunk/extensions/SemanticMediaWiki/includes/storage/SMW_Description.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/storage/SMW_Description.php
2008-11-17 17:26:26 UTC (rev 43610)
+++ trunk/extensions/SemanticMediaWiki/includes/storage/SMW_Description.php
2008-11-17 17:28:35 UTC (rev 43611)
@@ -39,6 +39,9 @@
if ( ($mode == SMWPrintRequest::PRINT_CCAT) && ($outputformat
=== '') ) {
$this->m_outputformat = 'x'; // changed default for
Boolean case
}
+ if ($this->m_data instanceof SMWDataValue) {
+ $this->m_data->setCaption($label);
+ }
}
public function getMode() {
@@ -64,7 +67,7 @@
case SMWPrintRequest::PRINT_CCAT:
return
$linker->makeLinkObj($this->m_data->getTitle(),
htmlspecialchars($this->m_label));
case SMWPrintRequest::PRINT_PROP:
- return $this->m_data->getLongHTMLText($linker);
+ return $this->m_data->getShortHTMLText($linker);
case SMWPrintRequest::PRINT_THIS: default: return
htmlspecialchars($this->m_label);
}
@@ -80,7 +83,7 @@
switch ($this->m_mode) {
case SMWPrintRequest::PRINT_CATS: return
$this->m_label; // TODO: link to Special:Categories
case SMWPrintRequest::PRINT_PROP:
- return
$this->m_data->getLongWikiText($linked);
+ return
$this->m_data->getShortWikiText($linked);
case SMWPrintRequest::PRINT_CCAT:
return '[[:' . $this->m_data->getPrefixedText()
. '|' . $this->m_label . ']]';
case SMWPrintRequest::PRINT_THIS: default:
return $this->m_label;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
