Refactored shared article import. Added meta search gem.

app/views/articles/_import_search_results.haml

@@ -1,5 +1,4 @@
-%p= pagination_links_remote @articles, :per_page => 10, |
-  :params => {:import_query => params[:import_query], :lists => params[:lists], :regional => params[:regional]} |
+%p= pagination_links_remote @articles, :per_page => 10, :params => {:search => params[:search]}
 %table.list
   %thead
     %tr 
@@ -14,14 +13,13 @@
   %tbody
     - for article in @articles
       %tr{:class => cycle('even','odd', :name => 'import_search_results')}
-        %td= highlight_phrase article.name, params[:import_query]
+        %td= highlight article.name, params[:search][:name_contains_all]
         %td= article.origin
         %td= article.manufacturer
         %td= article.note
         %td= number_to_currency(article.price)
         %td= article.unit
         %td= article.unit_quantity
-        %td= link_to_remote 'importieren', |
-                :url => import_supplier_articles_path(@supplier, :shared_article_id => article.id), |
-                :method => :get |
+        %td= link_to 'importieren', import_supplier_articles_path(@supplier, :shared_article_id => article.id),
+            :remote => true
         

app/views/articles/index.haml

@@ -26,18 +26,17 @@
     .column_content
       #search{:style => "padding-bottom:3em"}
         = form_tag shared_supplier_articles_path(@supplier), :method => :get, :remote => true do
-          = text_field_tag :import_query, params['import_query'], :size => 10
+          = text_field_tag "search[name_contains_all]", "", :size => 10
           = submit_tag "Suchen"
           - if @supplier.shared_supplier.lists
             Suche in folgenden Listen:
             - @supplier.shared_supplier.lists.each do |token, name|
-              = check_box_tag "lists[#{token}]", "1", true
+              = check_box_tag "search[list_equals_any][]", token, true
               = name
           |
           Nur aus der Region:
-          = check_box_tag "regional", "1", false
+          = check_box_tag "search[origin_equals]", "REG", false
         #search_results
-          // "import_search_results" will be rendered
       = link_to "Schließen", "#import", 'data-toggle-this' => '#import'
 
 .single_column{:style => 'width:100%; clear:both'}

app/views/articles/shared.js.erb

@@ -0,0 +1 @@
+$('#search_results').html('<%= escape_javascript(render("import_search_results")) %>');