diff options
| author | Michael Neves | 2012-01-26 16:19:48 +0100 |
|---|---|---|
| committer | Michael Neves | 2012-01-26 16:19:48 +0100 |
| commit | 7dce488bb10a0f4d74197cc195b933168c00102f (patch) | |
| tree | 680805dc6056528bea8233efe00b32d3b44f1685 | |
| parent | Preboot Type fix im Model (diff) | |
| download | pbs2-7dce488bb10a0f4d74197cc195b933168c00102f.tar.gz pbs2-7dce488bb10a0f4d74197cc195b933168c00102f.tar.xz pbs2-7dce488bb10a0f4d74197cc195b933168c00102f.zip | |
Bootiso View updated
3 files changed, 7 insertions, 7 deletions
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php index fd6419a..daa3d91 100644 --- a/application/modules/user/controllers/BootisoController.php +++ b/application/modules/user/controllers/BootisoController.php @@ -87,12 +87,12 @@ class user_BootisoController extends Zend_Controller_Action { $this->view->bootisolist = array_reverse($this->view->bootisolist); - $prebootMapper = new Application_Model_PreBootMapper(); - $this->view->prebootlist = array(); - + $preboottypeMapper = new Application_Model_PreBootTypeMapper(); + foreach ($this->view->bootisolist as $bootiso) { - $bootiso->setPrebootID("[".$bootiso->getPrebootID()."] ".$prebootMapper->find($bootiso->getPrebootID())->getTitle()); $bootiso->setGroupID("[".$bootiso->getGroupID()."] ".$groupMapper->find($bootiso->getGroupID())->getTitle()); + $bootiso->setPreBootTypeID($preboottypeMapper->find($bootiso->getID())->getName()); + $bootiso->setCreated(date(Zend_Registry::get('dateformat'), $bootiso->getCreated())); if($bootiso->getExpires() == "") { $bootiso->setExpires(0); diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml index cd94f9a..233dae4 100644 --- a/application/modules/user/views/scripts/bootiso/index.phtml +++ b/application/modules/user/views/scripts/bootiso/index.phtml @@ -17,7 +17,7 @@ <div class='code'>serialnumber</div> <div class='code'>public</div> <?php endif; ?> - <div class='code'>prebootID</div> + <div class='code'>preboottypeID</div> <div class='code'>title</div> <div class='code'>description</div> <div class='code'>groupID</div> @@ -79,7 +79,7 @@ $bootiso->setPrebootID(preg_replace("!^\[[0-9]+\]\s!",'',$bootiso->getPrebootID())); $bootiso->setGroupID(preg_replace("!^\[[0-9]+\]\s!",'',$bootiso->getGroupID())); } ?> - <div class='title'><?php echo $this->escape($bootiso->getTitle()); ?></div> + <div class='title'>[<?php echo $this->escape($bootiso->getPreBootTypeID()); ?>] <?php echo $this->escape($bootiso->getTitle()); ?></div> <div class='subtitle'><?php echo $this->escape($bootiso->getGroupID())." - ".$this->escape($bootiso->getDescription()); ?> </div> <div class='details dispnone'> diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml index d332800..ddcc5e5 100644 --- a/application/modules/user/views/scripts/preboot/index.phtml +++ b/application/modules/user/views/scripts/preboot/index.phtml @@ -54,7 +54,7 @@ true) ?>"><img src='/media/img/delete.png' alt='Delete Preboot'/></a> <?php endif; ?> </div> - <div class='title'><?php echo $this->escape($preboot->getTitle()); ?> <?php echo $this->escape($preboot->getPreBootTypeID()); ?></div> + <div class='title'>[<?php echo $this->escape($preboot->getPreBootTypeID()); ?>] <?php echo $this->escape($preboot->getTitle()); ?></div> <div class='subtitle'><?php echo $this->escape($preboot->getDescription()); ?></div> <div class='details'> <label>PrebootID</label> |