diff --git a/application/modules/courses/controllers/ViewController.php b/application/modules/courses/controllers/ViewController.php index c86808f312447e035159d322c1cde53c39fd03a1..ec2715a2f54d0fa3d69953c94b42e71f356998ab 100644 --- a/application/modules/courses/controllers/ViewController.php +++ b/application/modules/courses/controllers/ViewController.php @@ -104,6 +104,10 @@ class Courses_ViewController extends App_Controller_Action $this->view->lastRoleId = $roleId; $this->view->action = $action; + $decisionSession = new Zend_Session_Namespace('decidePostAction'); + $this->view->decisionMessage = $decisionSession->message; + unset ($decisionSession->message); + $session = new Zend_Session_Namespace(__CLASS__); if ($session->tabName) { $this->view->selectedCommentTab = $session->tabName; diff --git a/application/modules/courses/views/scripts/view/index.phtml b/application/modules/courses/views/scripts/view/index.phtml index 0319f764745f76737df594f974bf08688e7ac57c..65942c1418d0c498e4d1e522114fdeea791f26d5 100644 --- a/application/modules/courses/views/scripts/view/index.phtml +++ b/application/modules/courses/views/scripts/view/index.phtml @@ -8,6 +8,11 @@ if ($this->preview) { } $this->layout()->breadcrumbs = array($breadcrumb . ': ' . $this->course->getCourseCode() . ' (' . $this->request->getTypeDescription() . ')'); ?> + +<?php if ($this->decisionMessage) { ?> +<div id="decisionMessage"><?php echo $this->decisionMessage;?></div> +<?php } ?> + <div id="viewRequest"> <?php echo $this->partial('view/course-info.phtml', $this); ?> <?php echo $this->partial('view/course-files.phtml', $this); ?> diff --git a/application/modules/requests/controllers/IndexController.php b/application/modules/requests/controllers/IndexController.php index d3177fa3ea6e26199b3ad639f5df1d260cf475fd..97adc9047ab96e2f19cde3a242889a4dcc7eb7cb 100644 --- a/application/modules/requests/controllers/IndexController.php +++ b/application/modules/requests/controllers/IndexController.php @@ -210,6 +210,10 @@ class Requests_IndexController extends App_Controller_Action $this->view->user = $user; $this->view->userRequests = $userRequestsData; + $decisionSession = new Zend_Session_Namespace('decidePostAction'); + $this->view->decisionMessage = $decisionSession->message; + unset($decisionSession->message); + // save the order of requests to the session so we can have next/previous links on other pages. $session = new Zend_Session_Namespace('My Requests'); $session->requestOrder = array(); @@ -271,6 +275,13 @@ class Requests_IndexController extends App_Controller_Action } Requests_ApprovalChainModel::consider($requests); + + $session = new Zend_Session_Namespace('decidePostAction'); + if (count($requests) == 1) { + $session->message = 'Successfully submitted decision for 1 request.'; + } else { + $session->message = 'Successfully submitted decisions for ' . count($requests) . ' requests.'; + } if (array_key_exists('returnUrl', $in)) { $this->_redirect($in['returnUrl']); diff --git a/application/modules/requests/views/scripts/index/index.phtml b/application/modules/requests/views/scripts/index/index.phtml index d7f8147beeac2e8d0d090fc03a95264b2413537b..159cfeaccaf8efab2b3ad0cf3d596280b632142e 100644 --- a/application/modules/requests/views/scripts/index/index.phtml +++ b/application/modules/requests/views/scripts/index/index.phtml @@ -7,6 +7,9 @@ +<?php if ($this->decisionMessage) { ?> +<div id="decisionMessage"><?php echo $this->decisionMessage;?></div> +<?php } ?> <div id="announcements" class="titled_box"> diff --git a/document_root/css/courses/view.css b/document_root/css/courses/view.css index a7bd765f1e710f3c007f8ce0caaefeba5783ebf6..80e844f2bf20c6bd6e03ffcc71629df5c6b3358e 100644 --- a/document_root/css/courses/view.css +++ b/document_root/css/courses/view.css @@ -1,6 +1,8 @@ @CHARSET "UTF-8"; #creqMain {width: 720px;} +#decisionMessage {margin: 1em; padding: 0.5em; text-align: center; color: #060; background-color: #cfc; border: 1px solid #4c4;} + #editLink { text-align:center; } diff --git a/document_root/css/requests/index.css b/document_root/css/requests/index.css index c6b95771b0d1867d85b58dc9051804490dd39c2e..1d6e62bcce487ce3c376ee25de9386110298ad0c 100644 --- a/document_root/css/requests/index.css +++ b/document_root/css/requests/index.css @@ -1,6 +1,7 @@ @CHARSET "UTF-8"; #creqMain {width: 720px;} +#decisionMessage {margin: 1em; padding: 0.5em; text-align: center; color: #060; background-color: #cfc; border: 1px solid #4c4;} table.course_list {width: 100%;} table.course_list tr.odd {background-color:#E3E3E3;}