diff options
| author | Björn Geiger | 2011-04-05 18:13:19 +0200 |
|---|---|---|
| committer | Björn Geiger | 2011-04-05 18:13:19 +0200 |
| commit | 9af50098ab0cd1412c8db21da090ef526b9da592 (patch) | |
| tree | 09717998529795c7abc085b423667e942797f106 /application/modules/user/controllers/BootisoController.php | |
| parent | Search in Group, Person und Role (diff) | |
| parent | filter table repariert (diff) | |
| download | pbs2-9af50098ab0cd1412c8db21da090ef526b9da592.tar.gz pbs2-9af50098ab0cd1412c8db21da090ef526b9da592.tar.xz pbs2-9af50098ab0cd1412c8db21da090ef526b9da592.zip | |
Merge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers/BootisoController.php')
| -rw-r--r-- | application/modules/user/controllers/BootisoController.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php index 654e7eb..2c9c584 100644 --- a/application/modules/user/controllers/BootisoController.php +++ b/application/modules/user/controllers/BootisoController.php @@ -100,8 +100,6 @@ class user_BootisoController extends Zend_Controller_Action $this->view->pagination = $pagination->pagination($pageurl); $this->view->page = $pagination->getRequestPage(); - $this->view->bootisolist= $this->view->bootisolist; - $prebootMapper = new Application_Model_PreBootMapper(); $this->view->prebootlist = array(); @@ -109,7 +107,8 @@ class user_BootisoController extends Zend_Controller_Action foreach ($this->view->bootisolist as $bootiso){ $this->view->prebootlist[$bootiso->getID()] = $prebootMapper->find($bootiso->getPrebootID())->getTitle(); $bootiso->setGroupID("[".$bootiso->getGroupID()."] ".$groupMapper->find($bootiso->getGroupID())->getTitle()); - $bootiso->setMembershipID("[".$bootiso->getMembershipID()."] ".$personMapper->find($this->membershipMapper->find($bootiso->getMembershipID())->getPersonID())->getFirstname()); + $bootiso->setCreated(date(Zend_Registry::get('dateformat'),$bootiso->getCreated())); + $bootiso->setExpires(date(Zend_Registry::get('dateformat'),$bootiso->getExpires())); } } |