Fixed bug on ordergroups account managment page.
This commit is contained in:
parent
7067294133
commit
3a85d4f49f
2 changed files with 15 additions and 4 deletions
|
@ -18,7 +18,8 @@
|
||||||
:success => "Element.hide('loader')", |
|
:success => "Element.hide('loader')", |
|
||||||
:url => {:action => 'index'}, |
|
:url => {:action => 'index'}, |
|
||||||
:with => 'query', |
|
:with => 'query', |
|
||||||
:update => 'ordergroups' |
|
:update => 'ordergroups', |
|
||||||
|
:method => :get |
|
||||||
#ordergroups
|
#ordergroups
|
||||||
= render :partial => "ordergroups"
|
= render :partial => "ordergroups"
|
||||||
%br/
|
%br/
|
||||||
|
|
16
vendor/plugins/haml/init.rb
vendored
16
vendor/plugins/haml/init.rb
vendored
|
@ -1,8 +1,18 @@
|
||||||
begin
|
begin
|
||||||
require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here
|
require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here
|
||||||
rescue LoadError
|
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
|
end
|
||||||
|
|
||||||
# Load Haml and Sass
|
# Load Haml and Sass.
|
||||||
Haml.init_rails(binding)
|
# Haml may be undefined if we're running gems:install.
|
||||||
|
Haml.init_rails(binding) if defined?(Haml)
|
||||||
|
|
Loading…
Reference in a new issue