404 for pages and asset column error

This commit is contained in:
chris authored and ihower committed 2011-04-13 18:22:49 +08:00
1 parent d28a71f5bf
commit 27bdbadf08
3 files changed
+14 -11

No files matched your search

+12 -9
View File
@@ -9,16 +9,19 @@ class PagesController < ApplicationController
end
end
def show
item = Item.first(:conditions => {:full_name => params[:page_name]})
case item._type
when 'Page'
@page = item
render_liquid_page
when 'Link'
redirect_to "http://#{item[:url]}"
def show
begin
item = Item.first(:conditions => {:full_name => params[:page_name]})
case item._type
when 'Page'
@page = item
render_liquid_page
when 'Link'
redirect_to "http://#{item[:url]}"
end
rescue
render :file => "#{Rails.root}/public/404.html", :status => :not_found
end
end
end
+1 -1
View File
@@ -12,7 +12,7 @@
<th><%= t('admin.description') %></th>
<th><%= t('admin.format') %></th>
<th><%= t('admin.orig_upload_file') %></th>
<th><%= t('admin.file_name') %></th>
<th><%= t('admin.file_size') %></th>
<th><%= t('admin.action') %></th>
</tr>