From e9eb27ec2af1a2d59c8127066cf98fc7ef8b4d1d Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Mon, 10 Dec 2007 19:52:53 +0000
Subject: [PATCH] No more wizard editting view.
---
application/controllers/RequestController.php | 7 ++-----
application/library/View/Helper/BulletinEntry.php | 14 +++++++++++++-
application/views/request/fullEdit.xhtml | 4 ++++
application/views/sidebars/bulletinPreview.xhtml | 2 +-
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/application/controllers/RequestController.php b/application/controllers/RequestController.php
index 01d1f7e2..90278840 100755
--- a/application/controllers/RequestController.php
+++ b/application/controllers/RequestController.php
@@ -119,11 +119,8 @@ class RequestController extends Nmc_Controller_Action
Nmc_Registry_Session::getInstance()->course = $course;
$out = new Application_View();
- if ($request->type->name == 'RemoveCourse') {
- $out->location = '/Request/SupportiveMaterial';
- } else {
- $out->location = '/Request/CourseID';
- }
+ $out->location = '/Request/Edit';
+
echo $out->render('unlModernWrapper.xhtml');
}
diff --git a/application/library/View/Helper/BulletinEntry.php b/application/library/View/Helper/BulletinEntry.php
index 7de27d3f..65025097 100644
--- a/application/library/View/Helper/BulletinEntry.php
+++ b/application/library/View/Helper/BulletinEntry.php
@@ -8,7 +8,9 @@ class Application_View_Helper_BulletinEntry
?>
<div class="bulletinEntry">
<div>
- <?php
+ <?php if ($request->type->name == 'RemoveCourse') { ?>
+ <del>
+ <?php }
// ES and IS
if ($course->isEssentialStudies() == true) {
@@ -157,9 +159,19 @@ class Application_View_Helper_BulletinEntry
Prereq: <?php echo $course->prerequisite; ?>
<?php } ?>
<em><?php echo $course->notes; ?></em>
+
+ <?php if ($request->type->name == 'RemoveCourse') { ?>
+ </del>
+ <?php } ?>
</div>
+ <?php if ($request->type->name == 'RemoveCourse') { ?>
+ <del>
+ <?php } ?>
<?php echo $course->description; ?>
+ <?php if ($request->type->name == 'RemoveCourse') { ?>
+ </del>
+ <?php } ?>
</div>
diff --git a/application/views/request/fullEdit.xhtml b/application/views/request/fullEdit.xhtml
index 27bceea9..d08285fa 100644
--- a/application/views/request/fullEdit.xhtml
+++ b/application/views/request/fullEdit.xhtml
@@ -4,6 +4,9 @@
+<?php if ($this->request->type->name != 'RemoveCourse') { ?>
+
+
<div class="main_section">
<h2>Course ID</h2>
@@ -614,6 +617,7 @@
</div>
+<?php } // if not a remove course request ?>
diff --git a/application/views/sidebars/bulletinPreview.xhtml b/application/views/sidebars/bulletinPreview.xhtml
index 6afdf0f2..bd508ea1 100644
--- a/application/views/sidebars/bulletinPreview.xhtml
+++ b/application/views/sidebars/bulletinPreview.xhtml
@@ -2,7 +2,7 @@
<h4>Bulletin Preview</h4>
<?php
$originalCourse = $this->course->getParentGeneration(true);
- if ($originalCourse) {
+ if ($originalCourse && $this->request->type->name != 'RemoveCourse') {
echo $this->bulletinEntryDiff($originalCourse, $this->course, $this->request);
} else {
echo $this->bulletinEntry($this->course, $this->request);
--
GitLab