Changeset 5908

Show
Ignore:
Timestamp:
08/13/08 13:38:54 (3 months ago)
Author:
uta
Message:

2008/08/13 sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • rubricks_core/trunk/app/models/rubricks_group.rb

    r5901 r5908  
    22  acts_as_record_trails     :trails_fields => {:name => '[_Common_GroupName]'}, :default_methods => [:name] 
    33  acts_as_spinelz_treeview  :id_prefix => 'group_', :type => :directory, :children => :effective_children, :class_name => 'treeview_icon_group' 
    4   acts_as_tree 
     4  acts_as_tree              :order => 'sort_key asc' 
    55  has_many                  :rubricks_groups_rubricks_users,    :dependent => :destroy 
    66  has_many                  :rubricks_users,                    :through => :rubricks_groups_rubricks_users 
    …… 
    1313  validates_numericality_of :root_id,               :only_integer => true 
    1414  validates_length_of       :group_identifier,      :in => 0..16 
     15  validates_length_of       :sort_key,              :in => 0..16 
     16  validates_format_of       :sort_key,              :with => /^[a-z0-9]*$/ 
    1517  validates_length_of       :kana,                  :in => 1..64, :allow_nil => true 
    1618  validates_length_of       :name,                  :in => 1..64 
    …… 
    2325    REGISTERED_GROUP_ID     = 3 
    2426    TREE_GRADE_LIMIT        = 6 
    25     TREE_CHARACTER_LIMIT    = [24, 22, 20, 18, 16, 14, 12] 
     27    TREE_CHARACTER_LIMIT    = [18, 16, 14, 12, 10, 8, 6] 
    2628  end 
    2729 
    …… 
    4749          :private_component_id => rg_data[:private_component_id].to_i, 
    4850          :group_identifier     => '', 
    49           :kana                 => ((rg_data[:kana].blank?) ? nil : rg_data[:kana]), 
     51          :sort_key             => rg_data[:sort_key], 
    5052          :name                 => rg_data[:name], 
    5153          :description          => rg_data[:description], 
    …… 
    7274        :guest      => true, 
    7375        :include    => nil, 
     76        :order      => 'sort_key asc', 
    7477        :rc_id      => RubricksComponent::RUBRICKS_SYSTEM_COMPONENT_ID, 
    7578        :registered => true, 
    …… 
    9699      end 
    97100      conditions    = conditions.unshift(queries.join(' and ')) 
    98       self.find(:all, :conditions => conditions, :include => options[:include]) 
     101      self.find(:all, :conditions => conditions, :include => options[:include], :order => options[:order]) 
    99102    end 
    100103 
    …… 
    232235 
    233236  def update_group(rg_data) 
    234     self.kana           = RubricksLib.l(rg_data[:kana]) 
    235     self.kana           = nil if self.kana.blank? 
     237    self.sort_key       = rg_data[:sort_key] 
    236238    self.name           = rg_data[:name] unless rg_data[:name] == RubricksLib.hl(self.name) 
    237     self.description    = rg_data[:description] 
     239    self.description    = (rg_data[:description] || '') 
    238240    self.save! 
    239241    return self 
    …… 
    266268  protected 
    267269  def validate 
    268     errors.add('kana', 'is invalid format.') unless valid_kana? 
    269270    errors.add('name', 'is invalid format.') unless valid_name? 
    270   end 
    271  
    272   def valid_kana? 
    273     return true unless RubricksLib.current_lang == 'japanese' 
    274     kana_format = %r(#{RubricksLib.l('[_Common_Kana_Format]')}) 
    275     return kana.nil? || kana.match(kana_format) 
    276271  end 
    277272 

  • rubricks_core/trunk/app/models/rubricks_private_group.rb

    r5695 r5908  
    2020      return self.count(:conditions => ['rubricks_user_id = ?', ru_id]) < MAX_GROUP 
    2121    end 
     22 
     23    def create_group(rpg_data) 
     24      rpg = self.create!( 
     25        { 
     26          :rubricks_user_id => RubricksLib.current_user.id, 
     27          :sort_key         => rpg_data[:sort_key], 
     28          :name             => rpg_data[:name], 
     29          :description      => rpg_data[:description], 
     30        } 
     31      ) 
     32      return rpg 
     33    end 
     34 
     35    def find_my_groups 
     36      self.find(:all, :conditions => ['rubricks_user_id = ?', RubricksLib.current_user.id], :order => 'sort_key asc') 
     37    end 
     38 
     39    def update_group(rpg_data) 
     40      rpg = self.find(rpg_data[:id].to_i) 
     41      return rpg.update_group(rpg_data) 
     42    end 
    2243  end 
    2344 
    …… 
    2546    ru_id_list = self.rubricks_users.map{|ru| ru.id} 
    2647    return ru_id_list.include?(ru_id) 
     48  end 
     49 
     50  def update_group(rpg_data) 
     51    self.sort_key       = rpg_data[:sort_key] 
     52    self.name           = rpg_data[:name] 
     53    self.description    = rpg_data[:description] 
     54    self.save! 
     55    return self 
    2756  end 
    2857 
    …… 
    4473  protected 
    4574  def validate 
    46     errors.add('kana', 'is invalid format.') unless valid_kana? 
    4775    errors.add('name', 'is invalid format.') unless valid_name? 
    48   end 
    49  
    50   def valid_kana? 
    51     kana_format = %r(#{RubricksLib.l('[_Common_Kana_Format]')}) 
    52     return kana.nil? || kana.match(kana_format) 
    5376  end 
    5477 

  • rubricks_core/trunk/test/fixtures/common/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_1/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_10/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_11/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_12/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_13/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_14/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_15/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_16/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_17/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_18/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_19/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_2/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_20/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_21/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_22/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_23/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_24/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_25/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_26/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_27/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_3/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_4/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_5/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_6/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_7/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_8/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false 

  • rubricks_core/trunk/test/fixtures/system_config_9/rubricks_configs.csv

    r5755 r5908  
    666665,site_advanced_block_management,false 
    676766,site_maintenanced_at,20000101000000 
     6867,site_default_page,http://rubricks.org/ 
     6968,site_multilingual,false