desktop-finder 0.0.1.9 → 0.1.1

data/lib/desktop/finder.rb

@@ -32,25 +32,27 @@ module Desktop
           html << "<form method='get'>"
         end
         first = options.first
-        html << '<div class="search-where" id="J_searchWhere" style="'+ (params[first[:name]] ? '' : 'display:none;') + '">'
+        search_params = params[:search_where] || {}
+        html << '<div class="search-where" id="J_searchWhere" style="'+ (search_params ? '' : 'display:none;') + '">'
         select_option = []
         options.each do |option|
+          next if option.blank?
           case simple
           when false
-            html << label_tag("", option[:label], {:class=>"search-label"})
+            html << Desktop::Finder.label_tag("", option[:label], {:class=>"search-label"})
           else
             select_option = select_option.push([option[:name], option[:label]])
           end
           html << '<div class="seach-value">'
           case option[:type]
           when 'select'
-            html << select_tag(option[:name], options_from_collection_for_select(option[:value], "id", "name", params[option[:name]]), {:include_blank=>true})
+            html << Desktop::Finder.select_tag(option[:name], option[:value], search_params[option[:name]])
           else
-            html << text_field_tag(option[:name], params[option[:name]], {:class=>"span2"})
+            html << Desktop::Finder.text_field_tag(option[:name], search_params[option[:name]], {:class=>"span2"})
           end
           html << '</div>'
         end
-        html << submit_tag(t('Search'), {:class=>"btn"})
+        html << Desktop::Finder.submit_tag('Search', {:class=>"btn"})
         html << '</div>'
 
         if form
@@ -60,30 +62,35 @@ module Desktop
         html.html_safe
       end
 
-      def where(params)
-        where = params.reject{|p,v| p=='controller' or p=='action' or p=='search' or p=='commit' or v.empty?}
+      def Finder.where(params)
+        #where = params.reject{|p,v| p=='controller' or p=='action' or p=='search' or p=='commit' or v.empty?}
+        if !params.has_key?("search_where")
+          return {}
+        end
+        where = params[:search_where].reject{|p,v| v.empty?}
         where
       end
 
-      def submit_tag(label, options)
-        "<input type=\"button\" value='#{label}' class='#{options[:class]}' onclick='this.parent(\"form\").submit();' />"
+      def Finder.submit_tag(label, o)
+        "<input type=\"button\" value='#{label}' class='#{o[:class]}' onclick=\"$(this).parents('form:first').submit();\" />"
       end
 
-      def text_field_tag(name, value, options)
-        "<input type='text' name='#{name}' value='#{value}' class='#{options[:class]}' />"
+      def Finder.text_field_tag(name, value, o)
+        "<input type='text' name='search_where[#{name}]' value='#{value}' class='#{o[:class]}' />"
       end
 
-      def select_tag(name, options, value)
-        s = "<select name=\"#{name}\">"
-        options.each do|p|
-          s << '<option value='+ p.fetch(0) +'>' + p.many? ? p.fetch(1) : p.fetch(0) + '</option>'
+      def Finder.select_tag(name, o, value)
+        s = "<select name=\"search_where[#{name}]\">"
+        s << "<option value=''></option>"
+        o.each do|p|
+          s << '<option value="' << p.fetch(0).to_s << '" ' << (p.fetch(0).to_s==value.to_s ? 'selected="selected"' : '') << '>' << (p.many? ? p.fetch(1).to_s : p.fetch(0).to_s) << '</option>'
         end
         s << '</select>'
         s
       end
 
-      def label_tag(id, label, options)
-         "<label class='#{options[:class]}'>#{label}</label>"
+      def Finder.label_tag(id, label, o)
+         "<label class='#{o[:class]}'>#{label}</label>"
       end
 
   end

data/lib/desktop/finder/version.rb

@@ -1,5 +1,5 @@
 module Desktop
   module Finder
-    VERSION = "0.0.1.9"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: desktop-finder
 version: !ruby/object:Gem::Version
-  version: 0.0.1.9
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: