From 5336329dafe6591b0b1269e741e44a8ec01a9b28 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 5 Apr 2011 17:52:59 +0200 Subject: Dates angepasst --- application/modules/user/controllers/BootisoController.php | 5 ++--- application/modules/user/controllers/BootmenuController.php | 2 ++ application/modules/user/controllers/BootosController.php | 8 +++----- application/modules/user/controllers/ConfigController.php | 4 ++-- application/modules/user/controllers/PrebootController.php | 4 +--- 5 files changed, 10 insertions(+), 13 deletions(-) (limited to 'application/modules/user/controllers') 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())); } } diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php index f24cb47..738b7d5 100644 --- a/application/modules/user/controllers/BootmenuController.php +++ b/application/modules/user/controllers/BootmenuController.php @@ -69,6 +69,7 @@ class user_BootmenuController extends Zend_Controller_Action if(Pbs_Acl::checkRight('booai')){ $bootmenu = $this->bootmenuMapper->findBy(array('groupID' => $this->membership->getGroupID())); foreach ($bootmenu as $bm){ + $bm->setCreated(date(Zend_Registry::get('dateformat'),$bm->getCreated())); $bootmenuID = $bm->getID(); $bootmenuentries[$bootmenuID] = $this->bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID)); foreach ($bootmenuentries[$bootmenuID] as $bootmenuentry){ @@ -79,6 +80,7 @@ class user_BootmenuController extends Zend_Controller_Action }else{ $bootmenu = $this->bootmenuMapper->findBy(array('membershipID' => $this->membership->getID())); + $bootmenu[0]->setCreated(date(Zend_Registry::get('dateformat'),$bm->getCreated())); $bootmenuID = $bootmenu[0]->getID(); $bootmenuentries[$bootmenuID] = $this->bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID)); foreach ($bootmenuentries[$bootmenuID] as $bootmenuentry){ diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php index 12e2d68..04324ef 100644 --- a/application/modules/user/controllers/BootosController.php +++ b/application/modules/user/controllers/BootosController.php @@ -86,9 +86,7 @@ class user_BootosController extends Zend_Controller_Action $this->view->bootoslist = $pagination->getElements(); $this->view->pagination = $pagination->pagination($pageurl); - $this->view->page = $pagination->getRequestPage(); - $this->view->bootoslist = $this->view->bootoslist; - + $this->view->page = $pagination->getRequestPage(); $update = $this->_request->getParam('checkupdate'); @@ -96,9 +94,9 @@ class user_BootosController extends Zend_Controller_Action foreach ($this->view->bootoslist as $bootos){ $this->view->update[$bootos->getID()] = $update && $this->checkupdateAction($bootos); $bootos->setGroupID("[".$bootos->getGroupID()."] ".$groupMapper->find($bootos->getGroupID())->getTitle()); - $bootos->setMembershipID("[".$bootos->getMembershipID()."] ".$personMapper->find($this->membershipMapper->find($bootos->getMembershipID())->getPersonID())->getFirstname()); $bootos->setConfigID("[".$bootos->getConfigID()."] ".$configMapper->find($bootos->getConfigID())->getTitle()); - + $bootos->setCreated(date(Zend_Registry::get('dateformat'),$bootos->getCreated())); + $bootos->setExpires(date(Zend_Registry::get('dateformat'),$bootos->getExpires())); } } diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php index 498e890..2bb588e 100644 --- a/application/modules/user/controllers/ConfigController.php +++ b/application/modules/user/controllers/ConfigController.php @@ -7,6 +7,7 @@ class user_ConfigController extends Zend_Controller_Action protected $membershipMapper; protected $membership; protected $page; + protected $config; public function init() { @@ -62,7 +63,7 @@ class user_ConfigController extends Zend_Controller_Action } foreach ($this->view->configlist as $config){ - $config->setGroupID("[".$config->getGroupID()."] ".$groupMapper->find($config->getGroupID())->getTitle()); + $config->setCreated(date(Zend_Registry::get('dateformat'),$config->getCreated())); } // Search @@ -86,7 +87,6 @@ class user_ConfigController extends Zend_Controller_Action $this->view->pagination = $pagination->pagination($pageurl); $this->view->page = $pagination->getRequestPage(); - $this->view->configlist = $this->view->configlist; } diff --git a/application/modules/user/controllers/PrebootController.php b/application/modules/user/controllers/PrebootController.php index f283969..8bf6c47 100644 --- a/application/modules/user/controllers/PrebootController.php +++ b/application/modules/user/controllers/PrebootController.php @@ -84,9 +84,7 @@ class User_PrebootController extends Zend_Controller_Action $this->view->prebootlist = $pagination->getElements(); $this->view->pagination = $pagination->pagination($pageurl); - $this->view->page = $pagination->getRequestPage(); - $this->view->prebootlist= $this->view->prebootlist; - + $this->view->page = $pagination->getRequestPage(); $this->view->update = array(); -- cgit v1.2.3-55-g7522