diff --git a/app/views/finance/transactions/index.html.haml b/app/views/finance/transactions/index.html.haml index 690b751a..85faa83f 100644 --- a/app/views/finance/transactions/index.html.haml +++ b/app/views/finance/transactions/index.html.haml @@ -18,7 +18,8 @@ :success => "Element.hide('loader')", | :url => {:action => 'index'}, | :with => 'query', | - :update => 'ordergroups' | + :update => 'ordergroups', | + :method => :get | #ordergroups = render :partial => "ordergroups" %br/ diff --git a/vendor/plugins/haml/init.rb b/vendor/plugins/haml/init.rb index 7cd9a056..3b64a9e0 100644 --- a/vendor/plugins/haml/init.rb +++ b/vendor/plugins/haml/init.rb @@ -1,8 +1,18 @@ begin require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here rescue LoadError - require 'haml' # From gem + begin + require 'haml' # From gem + rescue LoadError => e + # gems:install may be run to install Haml with the skeleton plugin + # but not the gem itself installed. + # Don't die if this is the case. + raise e unless defined?(Rake) && + (Rake.application.top_level_tasks.include?('gems') || + Rake.application.top_level_tasks.include?('gems:install')) + end end -# Load Haml and Sass -Haml.init_rails(binding) +# Load Haml and Sass. +# Haml may be undefined if we're running gems:install. +Haml.init_rails(binding) if defined?(Haml)