Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

1 files changed, 63 insertions, 23 deletions

diff --git a/application/controllers/BootmenuController.php b/application/controllers/BootmenuController.php
index e2f4a2b..8cda756 100644
--- a/application/controllers/BootmenuController.php
+++ b/application/controllers/BootmenuController.php
@@ -22,32 +22,72 @@ class BootmenuController extends Zend_Controller_Action
 	    $this->view->configmapper = $configmapper;
 	   
 	    $bootmenuID = $this->_request->getParam('bootmenuid');
+	    $preboot =  $this->_request->getParam('preboot');
 	    
-    	if($bootmenuID == "")
-    	{
-    		$this->view->bootmenulist = $bootmenumapper->fetchAll();
-	    	$bootmenuentries = array();
-	    	foreach ($this->view->bootmenulist as $bootmenu){
-	    		  $bootmenuentries[$bootmenu->getID()] = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenu->getID());
-	    		  $bootmenu->setGroupID("[".$bootmenu->getGroupID()."] ".$groupmapper->find($bootmenu->getGroupID())->getTitle());
-	    		  $bootmenu->setMembershipID("[".$bootmenu->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootmenu->getMembershipID())->getPersonID())->getFirstname());
-	    	}	
-    	}else{
-    		$bootmenu = new Application_Model_BootMenu();
-    		$bootmenumapper->find($bootmenuID, $bootmenu);
-    		
-    		$bootmenuentries = array();
-	    	$bootmenuentries[$bootmenuID] = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenuID);
-	    	$bootmenu->setGroupID("[".$bootmenu->getGroupID()."] ".$groupmapper->find($bootmenu->getGroupID())->getTitle());
-	    	$bootmenu->setMembershipID("[".$bootmenu->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootmenu->getMembershipID())->getPersonID())->getFirstname());
+	    if($preboot=="")
+	    {
+	    	if($bootmenuID == "")
+	    	{
+	    		$this->view->bootmenulist = $bootmenumapper->fetchAll();
+		    	$bootmenuentries = array();
+		    	foreach ($this->view->bootmenulist as $bootmenu){
+		    		  $bootmenuentries[$bootmenu->getID()] = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenu->getID());
+		    		  $bootmenu->setGroupID("[".$bootmenu->getGroupID()."] ".$groupmapper->find($bootmenu->getGroupID())->getTitle());
+		    		  $bootmenu->setMembershipID("[".$bootmenu->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootmenu->getMembershipID())->getPersonID())->getFirstname());
+		    	}	
+	    	}else{
+	    		$bootmenu = new Application_Model_BootMenu();
+	    		$bootmenumapper->find($bootmenuID, $bootmenu);
+	    		
+	    		$bootmenuentries = array();
+		    	$bootmenuentries[$bootmenuID] = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenuID);
+		    	$bootmenu->setGroupID("[".$bootmenu->getGroupID()."] ".$groupmapper->find($bootmenu->getGroupID())->getTitle());
+		    	$bootmenu->setMembershipID("[".$bootmenu->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootmenu->getMembershipID())->getPersonID())->getFirstname());
+				
+		    	$this->view->bootmenulist = array($bootmenu);
+				
+	    	}
+	    		
+	    	$this->view->bootmenuentrylist = $bootmenuentries;
+	    	
+	    }else{
+	    	$this->_helper->layout->disableLayout();
+       		$this->_helper->viewRenderer->setNoRender();
+       		
+       		if($bootmenuID == "")
+    		{
+	    		$this->view->bootmenulist = $bootmenumapper->fetchAll();
+		    	$bootmenuentries = array();
+		    	foreach ($this->view->bootmenulist as $bootmenu){
+		    		  $bootmenuentries[$bootmenu->getID()] = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenu->getID());
+		    		  $bootmenu->setGroupID("[".$bootmenu->getGroupID()."] ".$groupmapper->find($bootmenu->getGroupID())->getTitle());
+		    		  $bootmenu->setMembershipID("[".$bootmenu->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootmenu->getMembershipID())->getPersonID())->getFirstname());
+		    }	
+    		}else{
+	    		$bootmenu = new Application_Model_BootMenu();
+	    		$bootmenumapper->find($bootmenuID, $bootmenu);
+	    		
+	    		$bootmenuentries = array();
+		    	$bootmenuentries[$bootmenuID] = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenuID);
+		    	$bootmenu->setGroupID("[".$bootmenu->getGroupID()."] ".$groupmapper->find($bootmenu->getGroupID())->getTitle());
+		    	$bootmenu->setMembershipID("[".$bootmenu->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootmenu->getMembershipID())->getPersonID())->getFirstname());
+				
+		    	$this->view->bootmenulist = array($bootmenu);
 			
-	    	$this->view->bootmenulist = array($bootmenu);
-			
-    	}	
+    		}
+    		
+    		$this->view->bootmenuentrylist = $bootmenuentries;
+    		
 
-    	
-    	$this->view->bootmenuentrylist = $bootmenuentries;
- 
+    		echo json_encode(
+    			array(
+    				'bootosmapper' => $this->view->bootosmapper,
+    				'configmapper' => $this->view->configmapper,
+    				'bootmenulist' => $this->view->bootmenulist, 
+    				'bootmenuentrylist' => $this->view->bootmenuentrylist
+    			)
+    		);	
+	    }
     }
 
     public function addbootmenuentryAction()