summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-28 12:05:07 +0200
committerBjörn Geiger2011-10-28 12:05:07 +0200
commitf5baee07fe7e57567ce0e7802364d88e1b9708f7 (patch)
tree63890cf511ed6a26c5cb3015ca5fc222f53e786f
parentFehler korrigiert (diff)
parentverschiedenes (diff)
downloadpbs2-f5baee07fe7e57567ce0e7802364d88e1b9708f7.tar.gz
pbs2-f5baee07fe7e57567ce0e7802364d88e1b9708f7.tar.xz
pbs2-f5baee07fe7e57567ce0e7802364d88e1b9708f7.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/pbs2
-rwxr-xr-xapplication/controllers/ResourceController.php54
-rwxr-xr-x[-rw-r--r--]application/modules/user/controllers/FilterController.php0
-rwxr-xr-x[-rw-r--r--]application/modules/user/forms/FilterEntry.php0
-rwxr-xr-x[-rw-r--r--]application/modules/user/views/scripts/filter/index.phtml0
4 files changed, 50 insertions, 4 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 757d002..1922933 100755
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -380,13 +380,13 @@ 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()) {
+ if($filter->getMembershipID() == $this->membership->getID() || $filter->getGroupID() == $this->membership->getGroupID()) {
$filterMapper->save($filter);
- header('HTTP/1.0 201 Filterentry changed');
+ header('HTTP/1.0 201 Filter changed');
} else {
- header('HTTP/1.0 403 No Right to change this Filterentry');
+ header('HTTP/1.0 403 No Right to change this Filter');
die();
}
} else {
@@ -504,6 +504,52 @@ class ResourceController extends Zend_Controller_Action
echo $xml;
}
+ public function changebootmenuAction()
+ {
+ list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '65', 'roleID' => $this->membership->getRoleID()));
+ if($rightroles == null){
+ header('HTTP/1.0 403 No Right to Create Bootmenus');
+ die();
+ }
+
+ $apikey = $this->_request->getParam('apikey');
+ if($apikey == ""){
+ header('HTTP/1.0 400 No API-Key');
+ die();
+ }
+
+ $params = $this->_request->getParams();
+ $groupID = $this->membership->getGroupID();
+ $bootmenuid = $params['bootmenuid'];
+
+ $bootmenuMapper = new Application_Model_BootMenuMapper();
+ $bootmenuEntriesMapper = new Application_Model_BootMenuEntriesMapper();
+
+ $bootmenu = new Application_Model_BootMenu();
+ $bootmenuMapper->find($bootmenuid, $bootmenu);
+ if($bootmenu->getID()) {
+ $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 {
+ header('HTTP/1.0 403 No Right to change this Bootmenu');
+ die();
+ }
+ }
+ }
+
public function deletebootmenuAction() {
list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '66', 'roleID' => $this->membership->getRoleID()));
if($rightroles == null){
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index 5d25448..5d25448 100644..100755
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
diff --git a/application/modules/user/forms/FilterEntry.php b/application/modules/user/forms/FilterEntry.php
index 515b3d7..515b3d7 100644..100755
--- a/application/modules/user/forms/FilterEntry.php
+++ b/application/modules/user/forms/FilterEntry.php
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index e7568c5..e7568c5 100644..100755
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml