From 49ebfec064bb6d7a732466fa2071778665beb184 Mon Sep 17 00:00:00 2001
From: Björn Geiger
Date: Mon, 28 Mar 2011 14:38:51 +0200
Subject: Einführung von Vererbung von Rollen

---
 application/modules/user/controllers/RoleController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'application/modules/user/controllers/RoleController.php')

diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
index b3795de..62d1550 100644
--- a/application/modules/user/controllers/RoleController.php
+++ b/application/modules/user/controllers/RoleController.php
@@ -76,10 +76,12 @@ class User_RoleController extends Zend_Controller_Action
 			$_POST['title'] = $role->getTitle();
 			$_POST['description'] = $role->getDescription();
 			$_POST['groupID'] = $role->getGroupID();
+			$_POST['inheritance'] = $role->getInheritance();
 			$editForm = new user_Form_RoleEdit(array('roleID' => $roleID));
 		} else {
 			$editForm = new user_Form_RoleEdit(array('roleID' => $roleID), $_POST);
 			if ($editForm->isValid($_POST)) {
+					
 				$role = new Application_Model_Role($_POST);
 				$role->setID($this->_request->getParam('roleID'));
 				try {
@@ -90,7 +92,11 @@ class User_RoleController extends Zend_Controller_Action
 					echo "Message: " . $e->getMessage() . "<br/>";
 					return;
 				}
-				$this->_helper->redirector('', 'role');
+				if(strpos($_SERVER['HTTP_REFERER'], '/user/role/show/roleID')) {
+					$this->_redirect('/user/role/show/roleID/' . $roleID);
+				} else {
+					$this->_helper->redirector('', 'role');
+				}
 				return;
 			}
 		}
-- 
cgit v1.2.3-55-g7522