summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/BootosController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-04-05 18:13:19 +0200
committerBjörn Geiger2011-04-05 18:13:19 +0200
commit9af50098ab0cd1412c8db21da090ef526b9da592 (patch)
tree09717998529795c7abc085b423667e942797f106 /application/modules/user/controllers/BootosController.php
parentSearch in Group, Person und Role (diff)
parentfilter table repariert (diff)
downloadpbs2-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/BootosController.php')
-rw-r--r--application/modules/user/controllers/BootosController.php8
1 files changed, 3 insertions, 5 deletions
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()));
}
}