Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth
Conflicts: config/environments/development.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/announcements_controller.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendor/built_in_modules/announcement/app/models/bulletin.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb vendor/built_in_modules/announcement/config/routes.rb vendor/built_in_modules/web_resource/lib/tasks/web_resource_tasks.rake
This commit is contained in:
commit
7c55f6fb88
|
@ -151,6 +151,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
|
|||
elsif is_sub_manager?
|
||||
@bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
|
||||
end
|
||||
<<<<<<< HEAD
|
||||
end
|
||||
|
||||
def get_sorted_bulletins
|
||||
|
@ -195,6 +196,8 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
|
|||
a.flatten!
|
||||
a.uniq
|
||||
end
|
||||
=======
|
||||
>>>>>>> 26cd6951dba43b1f6eaf5056160309c5c77a8716
|
||||
end
|
||||
|
||||
|
||||
|
|
Reference in New Issue