summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/BootisoController.php
diff options
context:
space:
mode:
authorSimon2011-04-05 18:03:15 +0200
committerSimon2011-04-05 18:03:15 +0200
commitd6c01d3907e3c607c6ca8332faaa20dcf7f81d2f (patch)
tree9bc41fa305dd457c881084038d55dd3cdfe4af34 /application/modules/user/controllers/BootisoController.php
parentDatumsformat eingebettet und Datum in Filter hinzugefügt (diff)
parentDates angepasst (diff)
downloadpbs2-d6c01d3907e3c607c6ca8332faaa20dcf7f81d2f.tar.gz
pbs2-d6c01d3907e3c607c6ca8332faaa20dcf7f81d2f.tar.xz
pbs2-d6c01d3907e3c607c6ca8332faaa20dcf7f81d2f.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers/BootisoController.php')
-rw-r--r--application/modules/user/controllers/BootisoController.php5
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()));
}
}