diff options
| author | michael pereira | 2011-04-07 14:45:51 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-07 14:45:51 +0200 |
| commit | 6af094f483774692b0d9178b917abc04fa50d446 (patch) | |
| tree | 27ba087e16d6fce71ebf499cf2e5a91771ef6f78 /application/modules/fbgui | |
| parent | Meta Recht geƤndert (diff) | |
| parent | fix der mapper in der fbgui (diff) | |
| download | pbs2-6af094f483774692b0d9178b917abc04fa50d446.tar.gz pbs2-6af094f483774692b0d9178b917abc04fa50d446.tar.xz pbs2-6af094f483774692b0d9178b917abc04fa50d446.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/fbgui')
| -rw-r--r-- | application/modules/fbgui/controllers/IndexController.php | 2 | ||||
| -rw-r--r-- | application/modules/fbgui/views/scripts/index/index.phtml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php index 8c840ea..bfd2bec 100644 --- a/application/modules/fbgui/controllers/IndexController.php +++ b/application/modules/fbgui/controllers/IndexController.php @@ -62,7 +62,7 @@ class Fbgui_IndexController extends Zend_Controller_Action 'Your client is '.$session->getClientID(), 'goto bootmenu '.$bootmenuID); $bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper(); - $res = $bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID),true); + $res = $bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID),false); $this->view->entries = $res; } else{ diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml index 70d255c..1fe02d4 100644 --- a/application/modules/fbgui/views/scripts/index/index.phtml +++ b/application/modules/fbgui/views/scripts/index/index.phtml @@ -23,6 +23,7 @@ $bootosMapper = new Application_Model_BootOsMapper(); $bootos = new Application_Model_BootOs(); $bootos = $bootosMapper->find($entry->getBootosID()); + ?> <div id="menu_item_1" class="menu" class="flexbox"> <img src="/media/img/os/ubuntu.png" /> |
