public
Fork of halorgium/mephisto
Description: A mirror of the mephisto code-base
Homepage: http://mephistoblog.com/
Clone URL: git://github.com/technoweenie/mephisto.git
Click here to lend your support to: mephisto and make a donation at www.pledgie.com !
fix mephisto init issue

git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2995 
567b1171-46fb-0310-a4c9-b4bef9110e78
technoweenie (author)
Tue Oct 16 04:57:59 -0700 2007
commit  b981bff34eaaa271b2e4ec4ec26154b573630045
tree    f1567d0e90a0a53e47ee40d3dc1649780629876b
parent  09d83a0a373693658fe6fe4dafc3518acf273e5a
...
29
30
31
32
33
 
 
 
 
 
 
 
 
34
35
36
...
29
30
31
 
 
32
33
34
35
36
37
38
39
40
41
42
0
@@ -29,8 +29,14 @@ class Admin::AssetsController < Admin::BaseController
0
     end
0
     Asset.transaction { @assets.each &:save! }
0
     flash[:notice] = @assets.size == 1 ? "'#{CGI.escapeHTML @assets.first.title}' was uploaded." : "#{@assets.size} assets were uploaded."
0
- @assets.size.zero? ? render(:action => 'new') : redirect_to(assets_path)
0
- rescue ActiveRecord::RecordInvalid
0
+ if @assets.size.zero?
0
+ @asset = Asset.new
0
+ render :action => 'new'
0
+ else
0
+ redirect_to assets_path
0
+ end
0
+ rescue ActiveRecord::RecordInvalid => e
0
+ @asset = e.record
0
     render :action => 'new'
0
   end
0
 
...
16
17
18
19
 
20
21
22
...
16
17
18
 
19
20
21
22
0
@@ -16,7 +16,7 @@ class ActionController::Dispatcher
0
   
0
   def cleanup_application_with_plugins(force = false)
0
     returning cleanup_application_without_plugins(force) do
0
- register_liquid_tags
0
+ self.class.register_liquid_tags
0
     end
0
   end
0
   

Comments

    No one has commented yet.