diff options
| author | Simon | 2011-03-22 13:10:17 +0100 |
|---|---|---|
| committer | Simon | 2011-03-22 13:10:17 +0100 |
| commit | 3e896c063bdb97e4e654379cdb36242798a8c07b (patch) | |
| tree | afa68a5d84fc45c1b2ae117662e8bda21dc8940f /application/models/BootOsMapper.php | |
| parent | FBGui verschönert, Css geadded, KioskModus vorbereitet (diff) | |
| parent | fbgui index merge (diff) | |
| download | pbs2-3e896c063bdb97e4e654379cdb36242798a8c07b.tar.gz pbs2-3e896c063bdb97e4e654379cdb36242798a8c07b.tar.xz pbs2-3e896c063bdb97e4e654379cdb36242798a8c07b.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/models/BootOsMapper.php')
| -rw-r--r-- | application/models/BootOsMapper.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/application/models/BootOsMapper.php b/application/models/BootOsMapper.php index fab73f2..1856384 100644 --- a/application/models/BootOsMapper.php +++ b/application/models/BootOsMapper.php @@ -66,7 +66,7 @@ class Application_Model_BootOsMapper } } - public function find($id) + public function find($id, Application_Model_BootOs $botos = null) { $botos = new Application_Model_BootOs(); $result = $this->getDbTable()->find($id); @@ -76,8 +76,14 @@ class Application_Model_BootOsMapper $row = $result->current(); - $botos->setID($row->bootosID)->setConfigID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPath_init($row->path_init)->setPath_kernel($row->path_kernel)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public); - return $botos; + if($botos == null){ + $botos = new Application_Model_BootOs(); + $botos->setID($row->bootosID)->setConfigID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPath_init($row->path_init)->setPath_kernel($row->path_kernel)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public); + return $botos; + }else{ + $botos->setID($row->bootosID)->setConfigID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPath_init($row->path_init)->setPath_kernel($row->path_kernel)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public); + } + } public function fetchAll() |