From 2ee30fee1685f49f28c7982f56e467d26c0b5254 Mon Sep 17 00:00:00 2001
From: benni <benni@posteo.de>
Date: Mon, 16 May 2011 11:00:52 +0200
Subject: [PATCH] Refactored home/ordergroup.

---
 app/controllers/home_controller.rb |  5 ++---
 app/helpers/application_helper.rb  | 21 ++++++---------------
 app/views/home/ordergroup.html.erb | 29 ++++++++++++++++-------------
 app/views/home/ordergroup.js.erb   |  1 +
 4 files changed, 25 insertions(+), 31 deletions(-)
 create mode 100644 app/views/home/ordergroup.js.erb

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 8c7d6cbc..266e9a6f 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -62,11 +62,10 @@ class HomeController < ApplicationController
         :order => sort)
       respond_to do |format|
         format.html # myOrdergroup.haml
-        format.js { render :partial => "finance/transactions/list" }
+        format.js { render :layout => false }
       end
     else
-      flash[:error] = "Leider bist Du kein Mitglied einer Bestellgruppe"
-      redirect_to root_path
+      redirect_to root_path, :alert => "Leider bist Du kein Mitglied einer Bestellgruppe"
     end
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a22543ba..6c6d2fbb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -59,31 +59,22 @@ module ApplicationHelper
   def sort_td_class_helper(param)
     result = 'class="sortup"' if params[:sort] == param
     result = 'class="sortdown"' if params[:sort] == param + "_reverse"
-    return result
+    result
   end
-  
+
   def sort_link_helper(text, key, options = {})
     per_page = options[:per_page] || 10
     action = options[:action] || "list"
     remote = options[:remote].nil? ? true : options[:remote]
     key += "_reverse" if params[:sort] == key
+    url = url_for(:sort => key, :page => nil, :per_page => per_page)
 
-    link_options = {
-        :url => url_for(:params => params.merge({:sort => key, :page => nil, :per_page => per_page})),
-        :before => "Element.show('loader')",
-        :success => "Element.hide('loader')",
-        :method => :get
-    }
     html_options = {
-      :title => _("Nach #{text} sortieren"),
-      :href => url_for(:action => action, :params => params.merge({:sort => key, :page => nil, :per_page => per_page}))
+        :title => "Nach #{text} sortieren",
+        :remote => remote
     }
 
-    if remote
-      link_to_remote(text, link_options, html_options)
-    else
-      link_to(text, link_options[:url], html_options)
-    end
+    link_to(text, url, html_options)
   end
   
   # Generates a link to the top of the website
diff --git a/app/views/home/ordergroup.html.erb b/app/views/home/ordergroup.html.erb
index d9954c14..52c07f29 100644
--- a/app/views/home/ordergroup.html.erb
+++ b/app/views/home/ordergroup.html.erb
@@ -14,7 +14,7 @@
         <li><%= membership.user.nick -%></li>
       <% end -%>
     </ul>
-    <%= remote_link_to('Person einladen', :url => new_invite_path(:id => @ordergroup)) %>
+    <%= link_to('Person einladen', new_invite_path(:id => @ordergroup), :remote => true) %>
   </div>
 </div>
 
@@ -23,18 +23,11 @@
     <h2>Kontoauszug</h2>
   </div>
   <div class="column_content">
-    <p>
-    <form name="sform" action="" style="display:inline;">
-      <label for="financial_transaction_note">Filter für Notizen: </label>
-      <%= text_field_tag("query", params['query'], :size => 10 ) %>
-    </form>
-    </p>
-    <%= observe_field 'query',  :frequency => 2,
-      :before => "Element.show('loader')",
-      :success => "Element.hide('loader')",
-      :url => {:action => 'ordergroup'},
-      :with => 'query',
-      :update => 'transactions' %>
+    <%= form_tag my_ordergroup_url, :method => :get, :style => 'display:inline;', :id => 'transactions_search',
+                 :remote => true do %>
+        <%= label_tag "financial_transaction_note", "Filter für Notizen:" %>
+        <%= text_field_tag("query", params['query'], :size => 10 ) %>
+    <% end %>
     <div id="transactions">
       <%= render :partial => "/finance/transactions/list" %>
     </div>
@@ -42,3 +35,13 @@
 </div>
 <div id="edit_box" style="display:none"></div>
 
+<% content_for :head do %>
+    <script type="text/javascript">
+      $(function() {
+          $('#query').observe_field(1, function() {
+              $('#transactions_search').submit();
+          });
+      })
+    </script>
+<% end %>
+
diff --git a/app/views/home/ordergroup.js.erb b/app/views/home/ordergroup.js.erb
new file mode 100644
index 00000000..ba71bff1
--- /dev/null
+++ b/app/views/home/ordergroup.js.erb
@@ -0,0 +1 @@
+$('#transactions').html('<%= escape_javascript(render("finance/transactions/list")) %>');
\ No newline at end of file