From 19520ac08266a4ccb64178437df242f57f96fff0 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Fri, 9 Nov 2007 19:06:38 +0000
Subject: [PATCH] IS and ES status should carry over in diff view
---
application/library/View/Helper/BulletinEntryDiff.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/application/library/View/Helper/BulletinEntryDiff.php b/application/library/View/Helper/BulletinEntryDiff.php
index 8198e428..07af5db6 100644
--- a/application/library/View/Helper/BulletinEntryDiff.php
+++ b/application/library/View/Helper/BulletinEntryDiff.php
@@ -8,13 +8,14 @@ class Application_View_Helper_BulletinEntryDiff
{
// ES and IS
$currentES = ($currentCourse->isEssentialStudies() == true ? '[ES]' : '');
- $proposedES = ($proposedCourse->isEssentialStudies() == true ? '[ES]' : '');
+ $proposedES = $currentES;
$diffES = $this->_getDiffText($currentES, $proposedES);
$currentIS = ($currentCourse->integratedStudies == 'yes' ? '[IS]' : '');
- $proposedIS = ($proposedCourse->integratedStudies == 'yes' ? '[IS]' : '');
if (in_array($request->type->name, array('AddISToCourse'))) {
$proposedIS = '[IS]';
+ } else {
+ $proposedIS = $currentIS;
}
$diffIS = $this->_getDiffText($currentIS, $proposedIS);
--
GitLab