Changeset 280

Show
Ignore:
Timestamp:
02/22/06 09:35:03 (3 years ago)
Author:
snowblink
Message:

Rolling back to 253 - removed wrapped_table_name

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • user_engine/branches/rb_1.0/app/models/permission.rb

    r271 r280  
    3131class Permission < ActiveRecord::Base 
    3232   
    33   set_table_name wrapped_table_name(UserEngine.config(:permission_table)) 
    34   has_and_belongs_to_many :roles, :join_table => wrapped_table_name(UserEngine.config(:permission_role_table)) 
     33  set_table_name UserEngine.config(:permission_table) 
     34  has_and_belongs_to_many :roles, :join_table => UserEngine.config(:permission_role_table) 
    3535 
    3636  validates_presence_of :controller, :action 

  • user_engine/branches/rb_1.0/app/models/role.rb

    r271 r280  
    3030# users using this application are allowed to perform. 
    3131class Role < ActiveRecord::Base 
    32   has_and_belongs_to_many :users, :class_name => "User", :join_table => wrapped_table_name(UserEngine.config(:user_role_table)) 
    33   has_and_belongs_to_many :permissions, :join_table => wrapped_table_name(UserEngine.config(:permission_role_table)) 
     32  has_and_belongs_to_many :users, :class_name => "User", :join_table => UserEngine.config(:user_role_table) 
     33  has_and_belongs_to_many :permissions, :join_table => UserEngine.config(:permission_role_table) 
    3434 
    3535  validates_length_of :name, :minimum => 3 
    …… 
    4343  end 
    4444   
    45   set_table_name wrapped_table_name(UserEngine.config(:role_table)) 
     45  set_table_name UserEngine.config(:role_table) 
    4646   
    4747  def destroy 

  • user_engine/branches/rb_1.0/lib/user_engine.rb

    r271 r280  
    4444 
    4545  # Join tables for users <-> roles, and roles <-> permissions 
    46    
    47   config :user_role_table, "#{config(:raw_role_table)}_#{LoginEngine.config(:user_table)}" 
    48   config :permission_role_table, "#{config(:raw_permission_table)}_#{config(:raw_role_table)}" 
     46  config :user_role_table, "#{LoginEngine.config(:user_table)}_#{config(:role_table)}" 
     47  config :permission_role_table, "#{config(:permission_table)}_#{config(:role_table)}" 
    4948 
    5049  # The names of the Guest and User roles 

  • user_engine/branches/rb_1.0/test/unit/permission_test.rb

    r271 r280  
    44   
    55  def test_table_name 
    6     assert_equal ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table_name)), Permission.table_name 
     6    assert_equal UserEngine.config(:permission_table_name), Permission.table_name 
    77  end 
    88 

  • user_engine/branches/rb_1.0/test/unit/role_test.rb

    r271 r280  
    33class RoleTest < Test::Unit::TestCase 
    44   
    5   fixture :users, :class_name => 'User', 
    6           :table_name => ActiveRecord::Base.wrapped_table_name(LoginEngine.config(:user_table)) 
    7   fixture :users_roles, :table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:user_role_table)) 
    8   fixture :roles, :class_name => 'Role', 
    9           :table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table)) 
    10   fixture :permissions_roles,  
    11           :table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_role_table)) 
    12   fixture :permissions, :class_name => 'Permission',  
    13           :table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table)) 
     5  fixture :users, :table_name => LoginEngine.config(:user_table), :class_name => 'User' 
     6  fixture :users_roles, :table_name => UserEngine.config(:user_role_table) 
     7  fixture :roles, :table_name => UserEngine.config(:role_table), :class_name => 'Role' 
     8  fixture :permissions_roles, :table_name => UserEngine.config(:permission_role_table) 
     9  fixture :permissions, :table_name => UserEngine.config(:permission_table), :class_name => 'Permission' 
    1410 
    1511  def test_table_name 
    16     assert_equal ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table)), Role.table_name 
     12    assert_equal UserEngine.config(:role_table), Role.table_name 
    1713  end 
    1814 

  • user_engine/branches/rb_1.0/test/unit/user_test.rb

    r271 r280  
    33class UserTest < Test::Unit::TestCase 
    44   
    5   fixture :users, :class_name => 'User', 
    6           :table_name => ActiveRecord::Base.wrapped_table_name(LoginEngine.config(:user_table)) 
    7   fixture :users_roles, :table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:user_role_table)) 
    8   fixture :roles, :class_name => 'Role', 
    9           :table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table)) 
    10   fixture :permissions_roles,  
    11           :table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_role_table)) 
    12   fixture :permissions, :class_name => 'Permission',  
    13           :table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table)) 
     5  fixture :users, :table_name => LoginEngine.config(:user_table), :class_name => 'User' 
     6  fixture :users_roles, :table_name => UserEngine.config(:user_role_table) 
     7  fixture :roles, :table_name => UserEngine.config(:role_table), :class_name => 'Role' 
     8  fixture :permissions_roles, :table_name => UserEngine.config(:permission_role_table) 
     9  fixture :permissions, :table_name => UserEngine.config(:permission_table), :class_name => 'Permission' 
    1410   
    1511  def test_table_name 
    16     assert_equal ActiveRecord::Base.wrapped_table_name(LoginEngine.config(:user_table)), User.table_name 
     12    assert_equal LoginEngine.config(:user_table), User.table_name 
    1713  end 
    1814