inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

svn merge -r 2570:2595 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root

Browse Source 
svn merge -r 2597:2649 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-04-12 14:58:21 +00:00
parent 0d45ce4c18
commit c88e18b6b7
9 changed files with 121 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java
View File

@@ -132,6 +132,7 @@ public class UISimpleSearch extends UICommand
*/
public void broadcast(FacesEvent event) throws AbortProcessingException
{
FacesContext fc = getFacesContext();
if (event instanceof SearchEvent)
{
// update the component parameters from the search event details
@@ -141,6 +142,7 @@ public class UISimpleSearch extends UICommand
SearchContext context = new SearchContext();
context.setText(searchEvent.SearchText);
context.setMode(searchEvent.SearchMode);
context.setForceAndTerms(Application.getClientConfig(fc).getForceAndTerms());
this.search = context;
super.broadcast(event);
@@ -149,7 +151,6 @@ public class UISimpleSearch extends UICommand
{
// special case to navigate to the advanced search screen
AdvancedSearchEvent searchEvent = (AdvancedSearchEvent)event;
FacesContext fc = getFacesContext();
fc.getApplication().getNavigationHandler().handleNavigation(fc, null, searchEvent.Outcome);
// NOTE: we don't call super() here so that our nav outcome is the one that occurs!