Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

1 files changed, 15 insertions, 0 deletions

diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index 000a5e9..ecc3c65 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -65,6 +65,17 @@ class user_ConfigController extends Zend_Controller_Action
     		$config->setGroupID("[".$config->getGroupID()."] ".$groupMapper->find($config->getGroupID())->getTitle());
     	}
     	
+    	// Search
+		$search = $this->_request->getParam('search');
+		$mySearch = new Pbs_Search();
+		$mySearch->setSearchTerm($search);
+		$mySearch->setModule('config');
+		$this->view->searchform = $mySearch->searchForm();
+		if($search != ''){
+			$this->view->search = $mySearch->getSearchTerm();			
+			$this->view->configlist = $mySearch->search($this->view->configlist);			
+		}
+    	
     	// Pagination
 	    $pagination = new Pbs_Pagination();	
 		$pagination->setPerPage(2);		
@@ -78,6 +89,10 @@ class user_ConfigController extends Zend_Controller_Action
 		$this->view->configlist = $this->view->configlist;    	 	    	
     		     	
     }
+    
+    public function searchAction(){
+		$this->_redirect('/user/config/index/search/'.($_GET['search']));
+	}
 
     public function createconfigAction()
     {