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

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
parent 0f354b8ccc 0647698012
commit cd1640482a
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/admin/object_auths_new_interface_controller.rb
View File

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

4
app/helpers/application_helper.rb
View File

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

2
app/models/ad_banner.rb
View File

@ -3,7 +3,7 @@ class AdBanner
include Mongoid::Timestamps include Mongoid::Timestamps
include Mongoid::MultiParameterAttributes include Mongoid::MultiParameterAttributes
include OrbitCoreLib::ObjectAuthable include OrbitCoreLib::ObjectAuthable
field :title field :title
field :transition_msec,type: Integer field :transition_msec,type: Integer
field :ad_fx #TODO Design should explain field :ad_fx #TODO Design should explain