Ray's modification before redesign

This commit is contained in:
Christophe Vilayphiou committed 2012-01-24 11:38:53 +08:00
1 parent b4f2354642
commit 6ee1d71c64
22 files changed
+1001 -579

No files matched your search

+1 -1
View File
@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
def front_end_available(module_app_title='')
app_controller = ModuleApp.first(conditions: {:title => module_app_title} )
unless app_controller.enable_frontend?
render :nothing
render :nothing => true
end
end
+4 -4
View File
@@ -19,7 +19,7 @@ class PagesController < ApplicationController
end
def show
begin
#begin
item = Item.first(:conditions => {:full_name => params[:page_name]})
case item._type
when 'Page'
@@ -28,9 +28,9 @@ class PagesController < ApplicationController
when 'Link'
redirect_to "http://#{item[:url]}"
end
rescue
render :file => "#{Rails.root}/public/404.html", :status => :not_found
end
#rescue
# render :file => "#{Rails.root}/public/404.html", :status => :not_found
#end
end
end