From 4fe92b844e8abd9963f29ba4795c3d9950761c2f Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 3 Jul 2012 15:47:28 +0800 Subject: [PATCH] Add sorting order for NCCU request --- lib/tasks/data_migration.rake | 12 ++++++++++++ .../announcement/widget/bulletins_controller.rb | 2 +- .../announcement/app/models/announcement_tag.rb | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 lib/tasks/data_migration.rake diff --git a/lib/tasks/data_migration.rake b/lib/tasks/data_migration.rake new file mode 100644 index 000000000..4e5b519cd --- /dev/null +++ b/lib/tasks/data_migration.rake @@ -0,0 +1,12 @@ +require 'resque_scheduler/tasks' +# encoding: utf-8 + +namespace :data_migration do + + task :add_order_to_announcement_tag_0703 => :environment do + AnnouncementTag.first({conditions:{ key: 'students' }}).update_attributes(:order=>1) + AnnouncementTag.first({conditions:{ key: 'alumni' }}).update_attributes(:order=>2) + AnnouncementTag.first({conditions:{ key: 'employee' }}).update_attributes(:order=>3) + AnnouncementTag.first({conditions:{ key: 'guest' }}).update_attributes(:order=>4) + end +end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index 316a715b4..dbd8844f1 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -27,7 +27,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController end def bulletins_and_web_links - @tags = AnnouncementTag.any_in(key: ['students', 'alumni', 'employee', 'guest']) + @tags = AnnouncementTag.any_in(key: ['students', 'alumni', 'employee', 'guest']).asc(:order) @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0] @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil diff --git a/vendor/built_in_modules/announcement/app/models/announcement_tag.rb b/vendor/built_in_modules/announcement/app/models/announcement_tag.rb index 9cb29038b..8bc390ebd 100644 --- a/vendor/built_in_modules/announcement/app/models/announcement_tag.rb +++ b/vendor/built_in_modules/announcement/app/models/announcement_tag.rb @@ -1,7 +1,7 @@ class AnnouncementTag < Tag has_and_belongs_to_many :bulletins - + field :order,:default => 0 def get_visible_bulletins(sort = :name) date_now = Time.now