desktop-finder 0.0.1.1 → 0.0.1.2

data/lib/desktop/finder/version.rb

@@ -1,5 +1,5 @@
 module Desktop
   module Finder
-    VERSION = "0.0.1.1"
+    VERSION = "0.0.1.2"
   end
 end

data/lib/desktop/finder.rb

@@ -8,55 +8,61 @@ module Desktop
     end
 
     def Finder.create(params, simple=false, form=nil)
-    #    options = options || [{:type => 'select', :name=>'staff_id', :lable=>t('Staff'), :value=>Staff.all}, {:type=>"text", :name=>"title", :lable=>t('Title'), :value=>''}]
-        options = options || [{:type=>"text", :name=>"title", :label=>t('Title'), :value=>''},{:type=>'select', :name=>'issue_type_id', :label=>t('Issue Type'), :value=>IssueType.all}]
-        options = options || {}
-        if options.empty? 
-           return ''
+      record = Kernel.const_get(params[:controller].classify).new.attributes
+      options = record.each_key.collect{|key| 
+        value = []
+        type = "text"
+        if key.include?("_id")
+          begin
+            value = Kernel.const_get(key.to_s.classify.sub('Id', '')).all.collect{|p|[p.id, p.name]}
+          rescue
+            next
+          end
+          type = "select"
         end
-        html = '<a href="#" class="pull-right" onclick="$(\'#J_searchWhere\').slideToggle();">.</a>'
-        if form
-          html << "<form method='get'>"
+        {:type=>type, :name=>key, :label=>t(key), :value=>value}
+      }
+      #options = options || [{:type=>"text", :name=>"title", :label=>t('Title'), :value=>''},{:type=>'select', :name=>'issue_type_id', :label=>t('Issue Type'), :value=>IssueType.all}]
+      options = options || {}
+      if options.empty? 
+        return ''
+      end
+      html = '<a href="#" class="pull-right" onclick="$(\'#J_searchWhere\').slideToggle();">.</a>'
+      if form
+        html << "<form method='get'>"
+      end
+      first = options.first
+      html << '<div class="search-where" id="J_searchWhere" style="'+ (params[first[:name]] ? '' : 'display:none;') + '">'
+      select_option = []
+      options.each do |option|
+        case simple
+        when false
+          html << label_tag("", option[:label], {:class=>"search-label"})
+        else
+          select_option = select_option.push([option[:name], option[:label]])
         end
-        first = options.first
-        html << '<div class="search-where" id="J_searchWhere" style="'+ (params[first[:name]] ? '' : 'display:none;') + '">'
-        select_option = []
-        options.each do |option|
-          case simple
-          when false
-            html << 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})
-          else
-            html << text_field_tag(option[:name], params[option[:name]], {:class=>"span2"})
-          end
-          html << '</div>'
+        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})
+        else
+          html << text_field_tag(option[:name], params[option[:name]], {:class=>"span2"})
         end
-        html << submit_tag(t('Search'), {:class=>"btn"})
         html << '</div>'
-
-        if form
-          html << '</form>'
-        end
-
-        html.html_safe
-        #<a href="#" onclick="$(this).parent('form').find('.search-where').show();" class="pull-right">.</a>
-        #  <div class="search-where" style="display:none;">
-        #    <table width="100%" class="table-form">
-        #      <tr>
-        #      </tr>
-        #    </table>
-        #  </div>
       end
+      html << submit_tag(t('Search'), {:class=>"btn"})
+      html << '</div>'
 
-      def Finder.where(params)
-        {}
-        #where = params.reject{|p,v| p=='controller' or p=='action' or p=='search' or p=='commit' or v.empty?}
+      if form
+        html << '</form>'
       end
+
+      html.html_safe
+    end
+
+    def Finder.where(params)
+      where = params.reject{|p,v| p=='controller' or p=='action' or p=='search' or p=='commit' or v.empty?}
+      where
+    end
   end
 end

metadata

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