diff options
| author | Simon | 2011-04-05 18:03:13 +0200 |
|---|---|---|
| committer | Simon | 2011-04-05 18:03:13 +0200 |
| commit | 79d04a0f4e443735c5c4790ac57e9e2b6b264a13 (patch) | |
| tree | c9cc33a0d6c989f23203b5288d4987c3ff302ca5 | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-79d04a0f4e443735c5c4790ac57e9e2b6b264a13.tar.gz pbs2-79d04a0f4e443735c5c4790ac57e9e2b6b264a13.tar.xz pbs2-79d04a0f4e443735c5c4790ac57e9e2b6b264a13.zip | |
Datumsformat eingebettet und Datum in Filter hinzugefügt
| -rw-r--r-- | application/modules/user/controllers/FilterController.php | 3 | ||||
| -rw-r--r-- | application/modules/user/controllers/SessionController.php | 2 | ||||
| -rw-r--r-- | pbs-newdata.sql | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index da42b76..ead81ab 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -48,7 +48,7 @@ class User_FilterController extends Zend_Controller_Action $this->view->notification = $pbsNotifier->notify('modify',$result); } - $filters = $this->filterMapper->findBy(array('groupID' => $this->membership->getGroupID()),true,array('priority'=>'DESC')); + $filters = $this->filterMapper->findBy(array('groupID' => $this->membership->getGroupID(),'membershipID'=>null),true,array('priority'=>'DESC')); $bootmenuMapper = new Application_Model_BootMenuMapper(); foreach($filters as $filter){ $ff = new Application_Model_Filter(); @@ -133,6 +133,7 @@ class User_FilterController extends Zend_Controller_Action $filterentry = new Application_Model_FilterEntries(); $filterentry->setFilterID($id); $filterentry->setFiltertypeID(6); + $filterentry->setCreated(time()); $filterentry->setFiltervalue($this->membership->getGroupID()); $filterentriesMapper->save($filterentry); diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php index 018e738..3768af9 100644 --- a/application/modules/user/controllers/SessionController.php +++ b/application/modules/user/controllers/SessionController.php @@ -62,7 +62,7 @@ class User_SessionController extends Zend_Controller_Action // Sort after date/id usort($mySessions, function($func_a, $func_b) { if($func_a->getID() == $func_b->getID()) return 0; - return ($func_a->getID() < $func_b->getID()) ? -1 : 1; + return ($func_a->getID() < $func_b->getID()) ? 1 : -1; }); // Search diff --git a/pbs-newdata.sql b/pbs-newdata.sql index 968a92a..c8a5f55 100644 --- a/pbs-newdata.sql +++ b/pbs-newdata.sql @@ -152,9 +152,9 @@ INSERT INTO `pbs_session` (`sessionID`, `alphasessionID`,`clientID`, `bootmenuen -- Adding Filter INSERT INTO `pbs_filter` (`filterID`, `membershipID`, `groupID`, `bootmenuID`, `title`, `description`, `created`, `priority`) VALUES -(1, NULL, 1, 1, 'Filter 1', 'Innerhalb der Uni', '', 1), -(2, NULL, 1, 2, 'Filter 2', 'Ausserhalb der Uni', '', 1), -(3, NULL, 1, 3, 'Filter 3', 'Montags-Freitag \r\nvon 8 bis 16 Uhr \r\nInnerhalb der Uni', '', 10); +(1, NULL, 1, 1, 'Filter 1', 'Innerhalb der Uni', '1300022113', 1), +(2, NULL, 1, 2, 'Filter 2', 'Ausserhalb der Uni', '1302000113', 1), +(3, NULL, 1, 3, 'Filter 3', 'Montags-Freitag \r\nvon 8 bis 16 Uhr \r\nInnerhalb der Uni', '1302022113', 10); -- Adding Filterentries INSERT INTO `pbs_filterentries` (`filterentriesID`, `filterID`, `filtertypeID`, `filtervalue`, `filtervalue2`) VALUES |