404 for pages and asset column error

This commit is contained in:
chris 2011-01-31 15:58:28 +08:00 committed by ihower
parent d28a71f5bf
commit 27bdbadf08
3 changed files with 14 additions and 11 deletions

View File

@ -10,15 +10,18 @@ class PagesController < ApplicationController
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]}"
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

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>

View File

@ -48,7 +48,7 @@ en:
editing_user_attribute: Editing user attribute
enable_language: Enable language
file_name: Filename
filr_size: File size
file_size: File size
format: Format
is_published: Is published
item: Item