*5938* Abstract displays original References List

pkp · Sep 25, 2010 · e8fcbcb · e8fcbcb
1 parent c117685
commit e8fcbcb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/classes/article/PublishedArticle.inc.php b/classes/article/PublishedArticle.inc.php
@@ -241,7 +241,7 @@ function getBestArticleId($journal = null) {
 			$publicArticleId = $this->getPublicArticleId();
 			if (!empty($publicArticleId)) return $publicArticleId;
 		}
-		return $this->getArticleId();
+		return $this->getId();
 	}
 
 	/**

diff --git a/pages/article/ArticleHandler.inc.php b/pages/article/ArticleHandler.inc.php
@@ -61,7 +61,7 @@ function view($args, &$request) {
 		$journalRt = $rtDao->getJournalRTByJournal($journal);
 
 		$sectionDao =& DAORegistry::getDAO('SectionDAO');
-		$section =& $sectionDao->getSection($article->getSectionId(), $journal->getJournalid(), true);
+		$section =& $sectionDao->getSection($article->getSectionId(), $journal->getId(), true);
 
 		$version = null;
 		if ($journalRt->getVersion()!=null && $journalRt->getDefineTerms()) {
@@ -146,6 +146,14 @@ function view($args, &$request) {
 				$templateMgr->assign('coverPageAltText', $article->getLocalizedCoverPageAltText());
 			}
 
+			// References list.
+			// FIXME: We only display the edited raw citations right now. We also want
+			// to allow for generated citations to be displayed here (including a way for
+			// the reader to choose any of the installed citation styles for output), see #5938.
+			$citationDao =& DAORegistry::getDAO('CitationDAO'); /* @var $citationDao CitationDAO */
+			$citationFactory =& $citationDao->getObjectsByAssocId(ASSOC_TYPE_ARTICLE, $article->getId());
+			$templateMgr->assign('citationFactory', $citationFactory);
+
 			// Increment the published article's abstract views count
 			if (!$request->isBot()) {
 				$publishedArticleDao =& DAORegistry::getDAO('PublishedArticleDAO');

diff --git a/templates/article/article.tpl b/templates/article/article.tpl
@@ -82,10 +82,14 @@
 		</div>
 	{/if}
 
-	{if $article->getCitations()}
+	{if $citationFactory}
 		<h4>{translate key="submission.citations"}</h4>
 		<br />
-		<div>{$article->getCitations()|strip_unsafe_html|nl2br}</div>
+		<div>
+			{iterate from=citationFactory item=citation}
+				<p>{$citation->getRawCitation()|strip_unsafe_html}</p>
+			{/iterate}
+		</div>
 		<br />
 	{/if}