merges

1 files changed, 22 insertions, 4 deletions

diff --git a/application/models/BootMenuMapper.php b/application/models/BootMenuMapper.php
index 8b39a5a..6ba72bd 100644
--- a/application/models/BootMenuMapper.php
+++ b/application/models/BootMenuMapper.php
@@ -84,7 +84,13 @@ class Application_Model_BootMenuMapper
 	public function save(Application_Model_BootMenu $botmenu)
 	{
 		
-		$data = array('bootmenuID'=> $botmenu->getID() ,'membershipID'=> $botmenu->getMembershipID(), 'groupID'=> $botmenu->getGroupID() ,'title'=> $botmenu->getTitle() ,'created'=> $botmenu->getCreated(), 'defaultbootmenu' => $botmenu->getDefaultbootmenu());
+		$data = array('bootmenuID'=> $botmenu->getID() ,
+						'membershipID'=> $botmenu->getMembershipID(), 
+						'groupID'=> $botmenu->getGroupID() ,
+						'title'=> $botmenu->getTitle() ,
+						'startcounter'=> $botmenu->getStartcounter() ,
+						'created'=> $botmenu->getCreated(), 
+						'defaultbootmenu' => $botmenu->getDefaultbootmenu());
 
 		if (null === ($id = $botmenu->getID()) ) {
 			unset($data['bootmenuID']);
@@ -113,10 +119,22 @@ class Application_Model_BootMenuMapper
 		
 		if($botmenu == null){
 			$botmenu = new Application_Model_BootMenu();
-			$botmenu->setID($row->bootmenuID)->setMembershipID($row->membershipID)->setGroupID($row->groupID)->setTitle($row->title)->setCreated($row->created)->setDefaultbootmenu($row->defaultbootmenu);
+			$botmenu->setID($row->bootmenuID)
+					->setMembershipID($row->membershipID)
+					->setGroupID($row->groupID)
+					->setTitle($row->title)
+					->setStartcounter($row->startcounter)
+					->setCreated($row->created)
+					->setDefaultbootmenu($row->defaultbootmenu);
 			return $botmenu;
 		}else{
-			$botmenu->setID($row->bootmenuID)->setMembershipID($row->membershipID)->setGroupID($row->groupID)->setTitle($row->title)->setCreated($row->created)->setDefaultbootmenu($row->defaultbootmenu);
+			$botmenu->setID($row->bootmenuID)
+					->setMembershipID($row->membershipID)
+					->setGroupID($row->groupID)
+					->setTitle($row->title)
+					->setStartcounter($row->startcounter)
+					->setCreated($row->created)
+					->setDefaultbootmenu($row->defaultbootmenu);
 		}
 			
 		
@@ -129,7 +147,7 @@ class Application_Model_BootMenuMapper
 		foreach ($resultSet as $row) {
 			$entry = new Application_Model_BootMenu();
 			
-			$entry->setID($row->bootmenuID)->setMembershipID($row->membershipID)->setGroupID($row->groupID)->setTitle($row->title)->setCreated($row->created)->setDefault($row->default);	
+			$entry->setID($row->bootmenuID)->setMembershipID($row->membershipID)->setGroupID($row->groupID)->setTitle($row->title)->setStartcounter($row->startcounter)->setCreated($row->created)->setDefault($row->default);	
 
 			$entries[] = $entry;
 		}