diff options
| author | Simon | 2011-04-05 17:42:11 +0200 |
|---|---|---|
| committer | Simon | 2011-04-05 17:42:11 +0200 |
| commit | c1c862b8d5206155fc116ce2fbaf9a759fc4f44c (patch) | |
| tree | 5c2b99bce5f0179a9698ed963dc0251255dddd9c /application/modules/user/controllers | |
| parent | recht für superadmin vergessen (diff) | |
| download | pbs2-c1c862b8d5206155fc116ce2fbaf9a759fc4f44c.tar.gz pbs2-c1c862b8d5206155fc116ce2fbaf9a759fc4f44c.tar.xz pbs2-c1c862b8d5206155fc116ce2fbaf9a759fc4f44c.zip | |
globales Datumsformat
Diffstat (limited to 'application/modules/user/controllers')
| -rw-r--r-- | application/modules/user/controllers/FilterController.php | 3 | ||||
| -rw-r--r-- | application/modules/user/controllers/SessionController.php | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index e9850a9..da42b76 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -49,10 +49,13 @@ class User_FilterController extends Zend_Controller_Action } $filters = $this->filterMapper->findBy(array('groupID' => $this->membership->getGroupID()),true,array('priority'=>'DESC')); + $bootmenuMapper = new Application_Model_BootMenuMapper(); foreach($filters as $filter){ $ff = new Application_Model_Filter(); $ff->setOptions($filter); $ff->setID($filter['filterID']); + $ff->setBootmenuID("[".$ff->getBootmenuID()."] ".$bootmenuMapper->find($ff->getBootmenuID())->getTitle()); + $ff->setCreated(date(Zend_Registry::get('dateformat'),$ff->getCreated())); $allFilter[] = $ff; } diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php index d149f22..018e738 100644 --- a/application/modules/user/controllers/SessionController.php +++ b/application/modules/user/controllers/SessionController.php @@ -18,6 +18,7 @@ class User_SessionController extends Zend_Controller_Action } else { $this->_helper->redirector('login', 'auth'); } + $this->page = $this->_request->getParam('page'); } @@ -53,7 +54,8 @@ class User_SessionController extends Zend_Controller_Action $personMapper->find($personID,$p); $session->setMembershipID("[".$session->getMembershipID()."] ".$p->getFirstname()." ".$p->getName()); - } + } + $session->setTime(date(Zend_Registry::get('dateformat'),$session->getTime())); $mySessions[] =$session; } } |
