summaryrefslogtreecommitdiffstats
path: root/application/models
diff options
context:
space:
mode:
authorSimon2011-03-29 11:22:04 +0200
committerSimon2011-03-29 11:22:04 +0200
commit0017ec00ed872a1cac818e7194f8e7b626ff604d (patch)
tree0bbec1661ccfb6e4634df5d3ec67a38b496a3abe /application/models
parentshortcut für rechte vorbereitet (diff)
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-0017ec00ed872a1cac818e7194f8e7b626ff604d.tar.gz
pbs2-0017ec00ed872a1cac818e7194f8e7b626ff604d.tar.xz
pbs2-0017ec00ed872a1cac818e7194f8e7b626ff604d.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/models')
-rw-r--r--application/models/GroupMapper.php1
-rw-r--r--application/models/PreBootMapper.php12
2 files changed, 12 insertions, 1 deletions
diff --git a/application/models/GroupMapper.php b/application/models/GroupMapper.php
index 331a61c..fa458d1 100644
--- a/application/models/GroupMapper.php
+++ b/application/models/GroupMapper.php
@@ -68,6 +68,7 @@ class Application_Model_GroupMapper
public function find($id,Application_Model_Group $group = null)
{
+ $return = false;
if($group == null){
$return = true;
}
diff --git a/application/models/PreBootMapper.php b/application/models/PreBootMapper.php
index db6d99f..6053b19 100644
--- a/application/models/PreBootMapper.php
+++ b/application/models/PreBootMapper.php
@@ -14,11 +14,21 @@ class Application_Model_PreBootMapper
->where($criteria . ' = ?', $value);
$stmt = $select->query();
$result = $stmt->fetchAll();
- return $result;
+
+ $entries = array();
+ foreach ($result as $row) {
+
+ $entry = new Application_Model_PreBoot($row);
+ $entry->setID($row['prebootID']);
+ $entries[] = $entry;
+ }
+
+ return $entries;
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
}
}
+
public function setDbTable($dbTable)
{