summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
authorSimon2011-04-01 16:56:05 +0200
committerSimon2011-04-01 16:56:05 +0200
commit8260a739a8570a58ac350ece8c88cb267bfa56f0 (patch)
tree8b924a1ede0f8e2c6f0d3058ef02b350123a585c /application/modules
parentPagination in Bootmenu part 2 (diff)
parentpage (diff)
downloadpbs2-8260a739a8570a58ac350ece8c88cb267bfa56f0.tar.gz
pbs2-8260a739a8570a58ac350ece8c88cb267bfa56f0.tar.xz
pbs2-8260a739a8570a58ac350ece8c88cb267bfa56f0.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/user/controllers/BootmenuController.php28
1 files changed, 14 insertions, 14 deletions
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 0f2fdd4..2c9d2b5 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -106,7 +106,7 @@ class user_BootmenuController extends Zend_Controller_Action
{
//TODO ACL Darf er BootMenus erstellen?
if(false)
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/addresult/forbidden');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/addresult/forbidden');
if (!isset($_POST["createbootmenu"])){
$bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu', 'rights' => 'all'));
@@ -126,9 +126,9 @@ class user_BootmenuController extends Zend_Controller_Action
}catch(Zend_Exception $e){
echo "Caught exception: " . get_class($e) . "<br/>";
echo "Message: " . $e->getMessage() . "<br/>";
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/addresult/error');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/addresult/error');
}
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/addresult/ok');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/addresult/ok');
}
}
@@ -140,17 +140,17 @@ class user_BootmenuController extends Zend_Controller_Action
//TODO ACL Is he allowed to edit BootMenus?
if(false)
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/modifyresult/forbidden');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/modifyresult/forbidden');
$bootmenuID = $this->_request->getParam('bootmenuID');
if (!is_numeric($bootmenuID))
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/modifyresult/forbidden');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/modifyresult/forbidden');
$bootmenu = new Application_Model_BootMenu();
$bootmenu = $this->bootmenuMapper->find($bootmenuID);
if($this->membership->getGroupID() != $bootmenu->getGroupID())
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/modifyresult/forbidden');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/modifyresult/forbidden');
if (!isset($_POST["editbootmenu"])){
@@ -171,7 +171,7 @@ class user_BootmenuController extends Zend_Controller_Action
//TODO ACL Is he allowed to edit this?
if(false)
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/modifyresult/forbidden');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/modifyresult/forbidden');
try {
$this->bootmenuMapper->save($bootmenu);
@@ -179,10 +179,10 @@ class user_BootmenuController extends Zend_Controller_Action
{
echo "Caught exception: " . get_class($e) . "<br/>";
echo "Message: " . $e->getMessage() . "<br/>";
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/modifyresult/error');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/modifyresult/error');
}
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/modifyresult/ok');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/modifyresult/ok');
}
}
@@ -195,27 +195,27 @@ class user_BootmenuController extends Zend_Controller_Action
//TODO ACL Is he allowed to delete Bootos?
if(false)
- $this->_redirect('/user/bootos/index/page/'.$page.'/deleteresult/forbidden');
+ $this->_redirect('/user/bootos/index/page/'.$this->page.'/deleteresult/forbidden');
try{
$bootmenuID = $this->_request->getParam('bootmenuID');
if (!is_numeric($bootmenuID))
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/deleteresult/forbidden');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/deleteresult/forbidden');
$bootmenu = new Application_Model_BootMenu();
$this->bootmenuMapper->find($bootmenuID, $bootmenu);
if($this->membership->getGroupID() != $bootmenu->getGroupID())
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/deleteresult/forbidden');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/deleteresult/forbidden');
$this->bootmenuMapper->delete($bootmenu);
}catch(Zend_Exception $e){
echo "Caught exception: " . get_class($e) . "<br/>";
echo "Message: " . $e->getMessage() . "<br/>";
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/deleteresult/error');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/deleteresult/error');
}
- $this->_redirect('/user/bootmenu/index/page/'.$page.'/deleteresult/ok');
+ $this->_redirect('/user/bootmenu/index/page/'.$this->page.'/deleteresult/ok');
}
public function addbootmenuentryAction()