From 519ddd72ce3da722d48a8048d4cc4dd1bbb18827 Mon Sep 17 00:00:00 2001
From: Roger Feese <rfeese@unl.edu>
Date: Wed, 15 Apr 2015 17:07:45 -0500
Subject: [PATCH] Don't try to load git notes from parent commit which may not
have notes.
---
.../bulletin/controllers/ViewController.php | 20 ++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/application/modules/bulletin/controllers/ViewController.php b/application/modules/bulletin/controllers/ViewController.php
index f620281f..a01ef797 100644
--- a/application/modules/bulletin/controllers/ViewController.php
+++ b/application/modules/bulletin/controllers/ViewController.php
@@ -149,18 +149,20 @@ class Bulletin_ViewController extends Requests_ViewController
$contents = $repo->getFileNotes(
'/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()
);
- $contents = Bulletin_SectionModel::getBodyHtml($contents);
- //$contents = UNL_UndergraduateBulletin_EPUB_Utilities::format($contents);
- $contents = UNL_UndergraduateBulletin_EPUB_Utilities::convertHeadings($contents);
- $requestProposedFileContents[$request->getId()] = $contents;
+ $proposedFileContents = Bulletin_SectionModel::getBodyHtml($proposedFileContents);
+ //$proposedFileContents = UNL_UndergraduateBulletin_EPUB_Utilities::format($proposedFileContents);
+ $proposedFileContents = UNL_UndergraduateBulletin_EPUB_Utilities::convertHeadings($proposedFileContents);
+ $requestProposedFileContents[$request->getId()] = $proposedFileContents;
}
$this->view->requests = $requests;
--
GitLab