diff --git a/app/helpers/announcements_helper.rb b/app/helpers/announcements_helper.rb index 51e7661..c3f1fa1 100644 --- a/app/helpers/announcements_helper.rb +++ b/app/helpers/announcements_helper.rb @@ -61,7 +61,7 @@ module AnnouncementsHelper "img_description" => desc } end - def get_feed_annc(type,site_source,locale,categories=nil) + def get_feed_annc(type,site_source,locale,categories=nil,max_len=nil) ma_key = 'announcement' if categories.nil? if type == "index" @@ -73,25 +73,13 @@ module AnnouncementsHelper end end categories = ["all"] if categories.length==0 - if categories.include?("all") - feeds = SiteFeedAnnc.where(:channel_key => ma_key) - else - feeds = SiteFeedAnnc.where(:channel_key => ma_key, :merge_with_category.in => categories) - end - if feeds.count > 0 - temp_ids = [] - data = feeds.collect do |feed| - feed.all_contents_for_feed(site_source,locale,type=='widget') - end.flatten.compact - else - data = [] - end + data = SiteFeedAnnc.get_feed_cache(ma_key,categories,site_source,locale,type=='widget',max_len) data end def get_feed_announcements(type,site_source=nil,categories=nil,max_len=nil) locale = OrbitHelper.get_site_locale.to_s if !(defined? SiteFeedAnnc).nil? - fans = get_feed_annc(type,site_source,locale,categories) + fans = get_feed_annc(type,site_source,locale,categories,max_len) else feed_anns = OrbitHelper.get_feed_for_module(type) fans = []