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 @@
-
- - <%= 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 %>