Merge pull request #92 from tubit/master

Added prefix option to search
ripienaar · Mar 28, 2013 · ccef6eb · ccef6eb
2 parents ac863b8 + eac3736
commit ccef6eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/gdash/sinatra_app.rb b/lib/gdash/sinatra_app.rb
@@ -106,7 +106,7 @@ def initialize(graphite_base, graph_templates, options = {})
       result = mapper.select {|d| d[:name] == dashboard && (category == nil || d[:category] == category )}
 
       if result.count == 1
-        redirect "#{result[0][:category]}/#{result[0][:link]}"
+        redirect "#{@prefix}/#{result[0][:category]}/#{result[0][:link]}"
       elsif result.count == 0 then
         @error = "No dashboards found in the templates directory, Search = <b>'#{search_string}'</b>"
         @dashboard_to_display = mapper.group_by {|d| d[:category]} 

diff --git a/views/layout.erb b/views/layout.erb
@@ -52,7 +52,7 @@
                             </li>
 			            </ul>
                   <div class="pull-right" style="" class='nav input-append'>
-                      <form id="form-search" name="dashboards" style="margin: 0;" class="form-search" method="get" action="/search">
+                      <form id="form-search" name="dashboards" style="margin: 0;" class="form-search" method="get" action="<%= @prefix %>/search">
                       <div class="input-append">
                       <input class="span2 search-query" name="dashboard" type="text" placeholder="Dashboard..." data-provide="typeahead" data-items="10" data-source='<%= @search_elements.to_s %>' autocomplete="off" />
                       <button class="btn btn-primary" style="margin-left: -5px; padding-bottom: 5px;" type="submit" value"submit" /><i class="icon-search icon-white"></i></button>