404 for pages and asset column error
This commit is contained in:
parent
d28a71f5bf
commit
27bdbadf08
|
@ -10,6 +10,7 @@ class PagesController < ApplicationController
|
|||
end
|
||||
|
||||
def show
|
||||
begin
|
||||
item = Item.first(:conditions => {:full_name => params[:page_name]})
|
||||
case item._type
|
||||
when 'Page'
|
||||
|
@ -18,7 +19,9 @@ class PagesController < ApplicationController
|
|||
when 'Link'
|
||||
redirect_to "http://#{item[:url]}"
|
||||
end
|
||||
|
||||
rescue
|
||||
render :file => "#{Rails.root}/public/404.html", :status => :not_found
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue