Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Update new project search
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Dec 4, 2013
1 parent 23cef02 commit bfa0d28
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 48 deletions.
14 changes: 9 additions & 5 deletions zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
Expand Up @@ -63,19 +63,23 @@ public void setCurrentPage(int page) {

/**
* Return first 5 results on project search
*
* @param query
*/
public List<SearchResult> suggestProjects(String query) {
searchQuery = query;
List<SearchResult> result = Lists.newArrayList();
if (StringUtils.isEmpty(searchQuery)) {
return result;
}
try {
List<SearchResult> result = Lists.newArrayList();
for (HProject project : projectDAO.searchQuery(query, 5, 0)) {
result.add(new SearchResult(project, query));
for (HProject project : projectDAO.searchQuery(searchQuery, 5, 0)) {
result.add(new SearchResult(project, searchQuery));
}
result.add(new SearchResult(query));
result.add(new SearchResult(searchQuery));
return result;
} catch (ParseException pe) {
return Lists.newArrayList();
return result;
}
}

Expand Down
6 changes: 4 additions & 2 deletions zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
Expand Up @@ -3,7 +3,8 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:s="http://jboss.org/schema/seam/taglib"
xmlns:rich="http://richfaces.org/rich">
xmlns:rich="http://richfaces.org/rich"
xmlns:zanata="http://java.sun.com/jsf/composite/zanata">

<h1 class="header__title">
<s:link view="/home.xhtml" propagation="none" id="home">
Expand Down Expand Up @@ -33,7 +34,7 @@
layout="list"
popupClass="auto-complete-list" id="form--search">
<rich:placeholder value="#{messages['jsf.SearchProjects']}"
styleClass="txt--neutral"/>
styleClass="form__placeholder"/>

<s:link propagation="none" view="/project/project.xhtml"
rendered="#{!suggestProject.isProjectNull()}">
Expand All @@ -47,6 +48,7 @@
<f:param name="query" value="#{suggestProject.query}"/>
</s:link>
</rich:autocomplete>

</h:form>
<ul class="header__main-nav__menu">
<li>
Expand Down
41 changes: 0 additions & 41 deletions zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml

This file was deleted.

0 comments on commit bfa0d28

Please sign in to comment.