diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-22 18:04:41 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-22 18:04:41 -0400 |
| commit | 266602ea1e97d886f031b80add7a760034221f76 (patch) | |
| tree | 8954ef28ad5d54e45515416f7dca9d371f41c0c2 | |
| parent | 27ed02ceaafe466307fc5a5d584aa329ea147be5 (diff) | |
basic search complete
| -rw-r--r-- | app/controllers/search_controller.rb | 8 | ||||
| -rw-r--r-- | app/views/search/go.html.erb | 25 | ||||
| -rw-r--r-- | app/views/tournaments/index.html.erb | 4 |
3 files changed, 30 insertions, 7 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 9da649d..51aee9e 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -3,10 +3,12 @@ class SearchController < ApplicationController def go @query = params[:query] - if (@query.nil?) return; + if (@query.nil?) then + return + end - @tournaments = Tournament.where("name LIKE '#{@query}'") - @players = User.where("name LIKE '#{@query}") + @tournaments = Tournament.where("name LIKE '%#{@query}%'") + @players = User.where("name LIKE '%#{@query}%'") end diff --git a/app/views/search/go.html.erb b/app/views/search/go.html.erb index 12a76c8..6d5826f 100644 --- a/app/views/search/go.html.erb +++ b/app/views/search/go.html.erb @@ -1,6 +1,23 @@ -<h3> Showing results for: <span><%= @query %></span></h3> +<%# Show search results if a query was not nill %> +<% if !@query.empty? %> + <h3> Showing results for: <span><%= @query %></span></h3> + <% if @tournaments.empty? and @players.empty? %> + <p> No results found for "<%= @query %>" </p> + <% else %> + <% if @tournaments.length > 0 %> + <h4> Tournaments </h4> + <% end %> + <% @tournaments.each do |t| %> + <%= render "common/show_tournament", :target => t %> + <% end %> -<% if @tounaments.empty? and @players.empty %> - <p> No results found for "<%= @query %>" </p> -<% else %>
\ No newline at end of file + <% if @players.length > 0 %> + <h4> Players </h4> + <% end %> + <% @players.each do |p| %> + <%= render "common/show_player", :target => p %> + <% end %> + + <% end %> +<% end %>
\ No newline at end of file diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 129f3de..06e1b25 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -2,16 +2,20 @@ <div id="tournament-list"> <% if @tournaments.length > 0 %> + <%# Each tournament has a div for its listing %> <% @tournaments.each do |t| %> <%= render "common/show_tournament", :target => t %> <% end %> + <% else %> + <p class="no-entries"> No tournaments going on right now... <% if current_user.can?(:create_tournament) %> Why not start your own? <% end %> </p> + <% end %> </div> |