developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/pages_controller.rb
View File

@ -10,6 +10,7 @@ class PagesController < ApplicationController
end end
def show def show
begin
item = Item.first(:conditions => {:full_name => params[:page_name]}) item = Item.first(:conditions => {:full_name => params[:page_name]})
case item._type case item._type
when 'Page' when 'Page'
@ -18,7 +19,9 @@ class PagesController < ApplicationController
when 'Link' when 'Link'
redirect_to "http://#{item[:url]}" redirect_to "http://#{item[:url]}"
end end
rescue
render :file => "#{Rails.root}/public/404.html", :status => :not_found
end
end end
end end

2
app/views/admin/assets/index.html.erb
View File

@ -12,7 +12,7 @@
<th><%= t('admin.description') %></th> <th><%= t('admin.description') %></th>
<th><%= t('admin.format') %></th> <th><%= t('admin.format') %></th>
<th><%= t('admin.orig_upload_file') %></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> <th><%= t('admin.action') %></th>
</tr> </tr>

2
config/locales/en.yml
View File

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