From b9c94cee722f6d974ec80013c1e8e653f15d8619 Mon Sep 17 00:00:00 2001
From: Joenio Costa <joenio@colivre.coop.br>
Date: Tue, 17 Nov 2009 18:23:06 -0300
Subject: [PATCH] Fix crash when listing admins of environment

---
 db/migrate/076_change_role_assignments.rb                   | 13 +++++++++++++
 db/schema.rb                                                |  6 +++---
 vendor/plugins/access_control/lib/role.rb                   |  2 +-
 vendor/plugins/access_control/test/acts_as_accessor_test.rb |  4 ++--
 vendor/plugins/access_control/test/permission_check_test.rb | 11 -----------
 vendor/plugins/access_control/test/role_test.rb             |  9 +++++++++
 vendor/plugins/access_control/test/test_helper.rb           |  2 +-
 7 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 db/migrate/076_change_role_assignments.rb

diff --git a/db/migrate/076_change_role_assignments.rb b/db/migrate/076_change_role_assignments.rb
new file mode 100644
index 0000000..453f9b2
--- /dev/null
+++ b/db/migrate/076_change_role_assignments.rb
@@ -0,0 +1,13 @@
+class ChangeRoleAssignments < ActiveRecord::Migration
+  def self.up
+    execute 'DELETE FROM role_assignments WHERE role_id NOT IN (SELECT id FROM roles)'
+
+    change_column :role_assignments, :accessor_id, :integer, :null => false
+    change_column :role_assignments, :role_id,     :integer, :null => false
+  end
+
+  def self.down
+    change_column :role_assignments, :accessor_id, :integer, :null => true
+    change_column :role_assignments, :role_id,     :integer, :null => true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4550de8..cf1f56c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 75) do
+ActiveRecord::Schema.define(:version => 76) do
 
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -282,11 +282,11 @@ ActiveRecord::Schema.define(:version => 75) do
   end
 
   create_table "role_assignments", :force => true do |t|
-    t.integer "accessor_id"
+    t.integer "accessor_id",   :null => false
     t.string  "accessor_type"
     t.integer "resource_id"
     t.string  "resource_type"
-    t.integer "role_id"
+    t.integer "role_id",       :null => false
     t.boolean "is_global"
   end
 
diff --git a/vendor/plugins/access_control/lib/role.rb b/vendor/plugins/access_control/lib/role.rb
index 241b835..b3b9a52 100644
--- a/vendor/plugins/access_control/lib/role.rb
+++ b/vendor/plugins/access_control/lib/role.rb
@@ -1,6 +1,6 @@
 class Role < ActiveRecord::Base
 
-  has_many :role_assignments
+  has_many :role_assignments, :dependent => :destroy
   belongs_to :environment
   serialize :permissions, Array
   validates_presence_of :name
diff --git a/vendor/plugins/access_control/test/acts_as_accessor_test.rb b/vendor/plugins/access_control/test/acts_as_accessor_test.rb
index af0c988..c568643 100644
--- a/vendor/plugins/access_control/test/acts_as_accessor_test.rb
+++ b/vendor/plugins/access_control/test/acts_as_accessor_test.rb
@@ -14,8 +14,8 @@ class ActAsAccessorTest < Test::Unit::TestCase
     r = AccessControlTestResource.create!(:name => 'bla')
     a = AccessControlTestAccessor.create!(:name => 'ze')
     member_role = Role.create!(:name => 'just_a_moderator', :permissions => ['bli'])
-    assert a.add_role(member_role, 'global')
-    assert a.has_permission?('bli', 'global')
+    assert a.add_role(member_role, r)
+    assert a.has_permission?('bli', r)
   end
 
   def test_add_role
diff --git a/vendor/plugins/access_control/test/permission_check_test.rb b/vendor/plugins/access_control/test/permission_check_test.rb
index 060ddc0..d52d695 100644
--- a/vendor/plugins/access_control/test/permission_check_test.rb
+++ b/vendor/plugins/access_control/test/permission_check_test.rb
@@ -15,17 +15,6 @@ class PermissionCheckTest < Test::Unit::TestCase
     assert_template 'access_denied.rhtml'
   end
 
-  def test_global_permission_granted
-    user = AccessControlTestAccessor.create!(:name => 'user')
-    role = Role.create!(:name => 'some_role', :permissions => ['see_index'])
-    assert user.add_role(role, 'global')
-    assert user.has_permission?('see_index', 'global')
-
-    get :index, :user => user.id
-    assert_response :success
-    assert_template nil
-  end
-
   def test_specific_permission_granted
     user = AccessControlTestAccessor.create!(:name => 'other_user')
     role = Role.create!(:name => 'other_role', :permissions => ['do_some_stuff'])
diff --git a/vendor/plugins/access_control/test/role_test.rb b/vendor/plugins/access_control/test/role_test.rb
index f978eae..a515467 100644
--- a/vendor/plugins/access_control/test/role_test.rb
+++ b/vendor/plugins/access_control/test/role_test.rb
@@ -98,4 +98,13 @@ class RoleTest < Test::Unit::TestCase
     assert ! role.has_kind?('kind3')
   end
 
+  def test_should_destroy_associated_role_assignments
+    role = Role.create!(:name => 'a test role', :permissions => ['perm1'])
+    ra = RoleAssignment.create!(:role => role, :accessor => AccessControlTestAccessor.create(:name => 'accessor'))
+
+    role.destroy
+
+    assert !RoleAssignment.exists?(ra.id)
+  end
+
 end
diff --git a/vendor/plugins/access_control/test/test_helper.rb b/vendor/plugins/access_control/test/test_helper.rb
index 7a110ea..c9233e3 100644
--- a/vendor/plugins/access_control/test/test_helper.rb
+++ b/vendor/plugins/access_control/test/test_helper.rb
@@ -18,7 +18,7 @@ RoleAssignment.set_table_name 'access_control_test_role_assignments'
 class AccessControlTestAccessor < ActiveRecord::Base
   set_table_name 'access_control_test_accessors'
   acts_as_accessor
-  def cache_keys
+  def cache_keys(arg)
     []
   end
   def blocks_to_expire_cache
--
libgit2 0.21.2