summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-27 16:10:37 +0200
committerBjörn Geiger2011-10-27 16:10:37 +0200
commit51c8e88b8e92363cf0f8e5a4a00f5804ecbbafd1 (patch)
treee254fcbafc6c9b27246415779e73bd295c57fe8c
parentchangebootmenu API (diff)
downloadpbs2-51c8e88b8e92363cf0f8e5a4a00f5804ecbbafd1.tar.gz
pbs2-51c8e88b8e92363cf0f8e5a4a00f5804ecbbafd1.tar.xz
pbs2-51c8e88b8e92363cf0f8e5a4a00f5804ecbbafd1.zip
verschiedenes
-rwxr-xr-xapplication/controllers/ResourceController.php27
1 files changed, 16 insertions, 11 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index e65d1ca..5ec0327 100755
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -380,7 +380,7 @@ class ResourceController extends Zend_Controller_Action
$filterid = $params['filterid'];
$filter = new Application_Model_Filter();
$filterMapper->find($filterid, $filter);
- if($filter->getID) {
+ if($filter->getID()) {
$filter->setOptions($params);
if($filter->getMembershipID() == $this->membership->getID() || $filter->getGroupID() == $this->membership->getGroupID()) {
$filterMapper->save($filter);
@@ -520,22 +520,27 @@ class ResourceController extends Zend_Controller_Action
$params = $this->_request->getParams();
$groupID = $this->membership->getGroupID();
- $bootmenuID = $params['bootmenuid'];
+ $bootmenuid = $params['bootmenuid'];
$bootmenuMapper = new Application_Model_BootMenuMapper();
$bootmenuEntriesMapper = new Application_Model_BootMenuEntriesMapper();
$bootmenu = new Application_Model_BootMenu();
- $bootmenuMapper->find($bootmenuID, $bootmenu);
+ $bootmenuMapper->find($bootmenuid, $bootmenu);
if($bootmenu->getID()) {
- $newBootmenu = clone $bootmenu;
- $newBootmenu->setOptions($params);
- if($newBootmenu->getMembershipID() == $this->membership->getID() || $newBootmenu->getGroupID() == $this->membership->getGroupID()) {
- $bootmenMapper->save($newBootmenu);
- $bootmenuEntries = $bootmenuEntriesMapper->findBy(array('bootmenuID' => $bootmenuID));
- foreach($bootmenuEntries as $bootmenuEntry) {
- $bootmenuEntry->setOptions($params);
- $bootmenuEntriesMapper->save($bootmenuEntry);
+ $bootmenu->setOptions($params);
+ if($bootmenu->getMembershipID() == $this->membership->getID() || $bootmenu->getGroupID() == $this->membership->getGroupID()) {
+ $bootmenuMapper->save($bootmenu);
+ if(isset($params['changeentry'])) {
+ $bootos = new Application_Model_BootOs();
+ $bootosMapper = new Application_Model_BootOsMapper();
+ $bootosMapper->find($params['bootosID'], $bootos);
+ $params['title'] = $bootos->getTitle();
+ $bootmenuEntries = $bootmenuEntriesMapper->findBy(array('bootmenuID' => $bootmenuid));
+ foreach($bootmenuEntries as $bootmenuEntry) {
+ $bootmenuEntry->setOptions($params);
+ $bootmenuEntriesMapper->save($bootmenuEntry);
+ }
}
header('HTTP/1.0 201 Bootmenu changed');
} else {