Changeset 5762

Show
Ignore:
Timestamp:
05/22/08 15:49:40 (2 years ago)
Author:
uta
Message:

2008/05/22 sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • components/bbs/trunk/bbs/_install/db/002_bbs_schema_002.rb

    r5696 r5762  
    3333        users_list << rgu.rubricks_user_id 
    3434      end 
     35      users_list.uniq! 
    3536      users_list.each {|u| 
    3637        to_user = Bbs::BbsGradeToUser.new() 
    …… 
    7172          end 
    7273        end 
     74        user_ids.uniq! 
    7375        user_ids.each {|u| 
    7476          to_user = Bbs::BbsGradeToUser.new() 
    …… 
    106108          end 
    107109        end 
     110        user_ids_p.uniq! 
    108111        user_ids_p.each {|u| 
    109112          to_user = Bbs::BbsGradeToUser.new() 
    …… 
    141144          end 
    142145        end 
    143  
     146        user_ids_v.uniq! 
    144147        user_ids_v.each {|u| 
    145148          to_user = Bbs::BbsGradeToUser.new() 

  • components/bbs/trunk/bbs/rubricks_search.rb

    r5696 r5762  
    1111      administrator = bbs_message.bbs_topic.bbs_forum.bbs_category.bbs_info.bbs_admin? 
    1212      bbs_forum = bbs_message.bbs_topic.bbs_forum 
    13       if bbs_forum.visible? 
     13      if bbs_forum.visible? && bbs_message.bbs_topic.viewer? 
    1414        result << { 
    1515          :url        => {:controller => '/bbs/bbs', :action => 'main', :params => {:display_type => 'message', :id => bbs_message.id}}, 
    …… 
    3030    query = "(#{query})" 
    3131    conditions.unshift(query) 
    32     count = Bbs::BbsMessage.count(:all, :include => :rubricks_user, :conditions => conditions) 
    33     return count 
     32     
     33    bm_list = Bbs::BbsMessage.find(:all, :conditions => conditions, :include => [:rubricks_user, [:bbs_topic => [:bbs_forum => [:bbs_category => :bbs_info ]]]]) 
     34    result = bm_list.select { |bbs_message| bbs_message.bbs_topic.bbs_forum.visible? && bbs_message.bbs_topic.viewer? } 
     35    return result.size 
    3436  end 
    3537