summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Neves2012-01-26 16:26:54 +0100
committerMichael Neves2012-01-26 16:26:54 +0100
commit162338ceb04625d1f7908d0933ab47dcaa7cfa72 (patch)
tree44b873dea75b79d3fed1d47866a0180c5431e676
parentBootiso View fix (diff)
downloadpbs2-162338ceb04625d1f7908d0933ab47dcaa7cfa72.tar.gz
pbs2-162338ceb04625d1f7908d0933ab47dcaa7cfa72.tar.xz
pbs2-162338ceb04625d1f7908d0933ab47dcaa7cfa72.zip
Bootiso and Preboot Controller fix
-rw-r--r--application/modules/user/controllers/BootisoController.php3
-rw-r--r--application/modules/user/controllers/PrebootController.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php
index daa3d91..7bdeb7c 100644
--- a/application/modules/user/controllers/BootisoController.php
+++ b/application/modules/user/controllers/BootisoController.php
@@ -91,8 +91,7 @@ class user_BootisoController extends Zend_Controller_Action {
foreach ($this->view->bootisolist as $bootiso) {
$bootiso->setGroupID("[".$bootiso->getGroupID()."] ".$groupMapper->find($bootiso->getGroupID())->getTitle());
- $bootiso->setPreBootTypeID($preboottypeMapper->find($bootiso->getID())->getName());
-
+ $bootiso->setPreBootTypeID($preboottypeMapper->find($bootiso->getPreBootTypeID())->getName());
$bootiso->setCreated(date(Zend_Registry::get('dateformat'), $bootiso->getCreated()));
if($bootiso->getExpires() == "") {
$bootiso->setExpires(0);
diff --git a/application/modules/user/controllers/PrebootController.php b/application/modules/user/controllers/PrebootController.php
index c739b03..4f83820 100644
--- a/application/modules/user/controllers/PrebootController.php
+++ b/application/modules/user/controllers/PrebootController.php
@@ -66,7 +66,7 @@ class User_PrebootController extends Zend_Controller_Action {
$this->view->prebootlist = $this->prebootMapper->findBy(array("groupID" => $groupID));
foreach ($this->view->prebootlist as $preboot) {
$preboot->setCreated(date(Zend_Registry::get('dateformat'), $preboot->getCreated()));
- $preboot->setPreBootTypeID($preboottypeMapper->find($preboot->getID())->getName());
+ $preboot->setPreBootTypeID($preboottypeMapper->find($preboot->getPreBootTypeID())->getName());
}
// Search