Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509

Conflicts:
	app/views/layouts/_side_bar.html.erb
This commit is contained in:
Christophe Vilayphiou 2012-05-17 06:45:30 +08:00
commit cd1640482a
3 changed files with 5 additions and 2 deletions

View File

@ -1,6 +1,5 @@
class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController
include OrbitCoreLib::PermissionUnility
before_filter :force_order

View File

@ -172,6 +172,10 @@ module ApplicationHelper
locale.to_sym == I18n.locale ? 'active in': ''
end
def at_least_module_manager
is_manager? || is_admin?
end
def dislpay_view_count(object)
"#{t(:view_count)}: #{object.view_count}"
end