Skip to content
Snippets Groups Projects
Commit 519ddd72 authored by Roger W Feese's avatar Roger W Feese
Browse files

Don't try to load git notes from parent commit which may not have notes.

parent f1c06ff1
No related branches found
No related tags found
1 merge request!27Fix bulletin view missing notes error
...@@ -149,18 +149,20 @@ class Bulletin_ViewController extends Requests_ViewController ...@@ -149,18 +149,20 @@ class Bulletin_ViewController extends Requests_ViewController
$contents = $repo->getFileNotes( $contents = $repo->getFileNotes(
'/data/' . $repo->getFilePathForSection($section), $parentCommit '/data/' . $repo->getFilePathForSection($section), $parentCommit
); );
$contents = Bulletin_SectionModel::getBodyHtml($contents);
//$contents = UNL_UndergraduateBulletin_EPUB_Utilities::format($contents);
$contents = UNL_UndergraduateBulletin_EPUB_Utilities::convertHeadings($contents);
$requestOriginalFileContents[$request->getId()] = $contents;
$contents = $repo->getFileNotes( $originalFileContents = $repo->getFileContents('/data/' . $repo->getFilePathForSection($section), $parentCommit);
$originalFileContents = Bulletin_SectionModel::getBodyHtml($originalFileContents);
//$originalFileContents = UNL_UndergraduateBulletin_EPUB_Utilities::format($originalFileContents);
$originalFileContents = UNL_UndergraduateBulletin_EPUB_Utilities::convertHeadings($originalFileContents);
$requestOriginalFileContents[$request->getId()] = $originalFileContents;
$proposedFileContents = $repo->getFileNotes(
'/data/' . $repo->getFilePathForSection($section), 'request-' . $request->getId() '/data/' . $repo->getFilePathForSection($section), 'request-' . $request->getId()
); );
$contents = Bulletin_SectionModel::getBodyHtml($contents); $proposedFileContents = Bulletin_SectionModel::getBodyHtml($proposedFileContents);
//$contents = UNL_UndergraduateBulletin_EPUB_Utilities::format($contents); //$proposedFileContents = UNL_UndergraduateBulletin_EPUB_Utilities::format($proposedFileContents);
$contents = UNL_UndergraduateBulletin_EPUB_Utilities::convertHeadings($contents); $proposedFileContents = UNL_UndergraduateBulletin_EPUB_Utilities::convertHeadings($proposedFileContents);
$requestProposedFileContents[$request->getId()] = $contents; $requestProposedFileContents[$request->getId()] = $proposedFileContents;
} }
$this->view->requests = $requests; $this->view->requests = $requests;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment