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

Merge branch 'design_team' into ldap

This commit is contained in:
Christophe Vilayphiou 2012-05-25 10:01:41 +08:00
parent 3480fa2545 75b67dddf5
commit a663231c8c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendored
View File

@ -137,7 +137,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
else else
@bulletin = Bulletin.new(params[:bulletin]) @bulletin = Bulletin.new(params[:bulletin])
@bulletin.deadline = nil if @bulletin.deadline < @bulletin.postdate @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil)
@bulletin.create_user_id = current_user.id @bulletin.create_user_id = current_user.id
@bulletin.update_user_id = current_user.id @bulletin.update_user_id = current_user.id
@ -246,7 +246,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
else else
@bulletin = Bulletin.find(params[:id]) @bulletin = Bulletin.find(params[:id])
@bulletin.deadline = nil if @bulletin.deadline < @bulletin.postdate @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil)
@bulletin.update_user_id = current_user.id @bulletin.update_user_id = current_user.id

6
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb vendored
View File

@ -36,7 +36,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
# @news_bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_news_bulletins : NewsBulletin.all.page(params[:page]).per(10) # @news_bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_news_bulletins : NewsBulletin.all.page(params[:page]).per(10)
@news_bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("news_bulletin") : NewsBulletin.all.page(params[:page]).per(10) @news_bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("news_bulletin") : get_viewable("news_bulletin")
@news_bulletin_categories = NewsBulletinCategory.all @news_bulletin_categories = NewsBulletinCategory.all
@news_bulletin_link = NewsBulletinLink.new @news_bulletin_link = NewsBulletinLink.new
@ -136,7 +136,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
else else
@news_bulletin = NewsBulletin.new(params[:news_bulletin]) @news_bulletin = NewsBulletin.new(params[:news_bulletin])
@news_bulletin.deadline = nil if @news_bulletin.deadline < @news_bulletin.postdate @news_bulletin.deadline = nil if (@news_bulletin.deadline < @news_bulletin.postdate rescue nil)
@news_bulletin.create_user_id = current_user.id @news_bulletin.create_user_id = current_user.id
@news_bulletin.update_user_id = current_user.id @news_bulletin.update_user_id = current_user.id
@ -245,7 +245,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
else else
@news_bulletin = NewsBulletin.find(params[:id]) @news_bulletin = NewsBulletin.find(params[:id])
@news_bulletin.deadline = nil if @news_bulletin.deadline < @news_bulletin.postdate @news_bulletin.deadline = nil if (@news_bulletin.deadline < @news_bulletin.postdate rescue nil)
@news_bulletin.update_user_id = current_user.id @news_bulletin.update_user_id = current_user.id