lockdown 1.1.3 → 1.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/lockdown/database.rb +14 -2
  2. data/lib/lockdown.rb +1 -1
  3. metadata +2 -2
data/lib/lockdown/database.rb CHANGED
@@ -38,7 +38,13 @@ module Lockdown
38
38
  db_perms.each do |dbp|
39
39
  unless @permissions.include?(Lockdown.get_symbol(dbp.name))
40
40
  puts ">> Lockdown: Permission no longer in init.rb: #{dbp.name}, deleting."
41
- Lockdown.database_execute("delete from permissions_user_groups where permission_id = #{dbp.id}")
41
+ ug_table = Lockdown.user_groups_hbtm_reference.to_s
42
+ if "permissions" < ug_table
43
+ join_table = "permissions_#{ug_table}"
44
+ else
45
+ join_table = "#{ug_table}_permissions"
46
+ end
47
+ Lockdown.database_execute("delete from #{join_table} where permission_id = #{dbp.id}")
42
48
  dbp.destroy
43
49
  end
44
50
  end
@@ -68,7 +74,13 @@ module Lockdown
68
74
  p = ::Permission.find(:first, :conditions => ["name = ?",
69
75
  Lockdown.get_string(perm)])
70
76
 
71
- Lockdown.database_execute "insert into permissions_user_groups(permission_id, user_group_id) values(#{p.id}, #{ug.id})"
77
+ ug_table = Lockdown.user_groups_hbtm_reference.to_s
78
+ if "permissions" < ug_table
79
+ join_table = "permissions_#{ug_table}"
80
+ else
81
+ join_table = "#{ug_table}_permissions"
82
+ end
83
+ Lockdown.database_execute "insert into #{join_table}(permission_id, #{Lockdown.user_group_id_reference}) values(#{p.id}, #{ug.id})"
72
84
  end
73
85
  end
74
86
 
data/lib/lockdown.rb CHANGED
@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), "lockdown", "helper")
3
3
  module Lockdown
4
4
  extend Lockdown::Helper
5
5
 
6
- VERSION = '1.1.3'
6
+ VERSION = '1.1.5'
7
7
 
8
8
  # Returns the version string for the library.
9
9
  def self.version
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lockdown
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.3
4
+ version: 1.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-08-04 00:00:00 -04:00
12
+ date: 2009-08-05 00:00:00 -04:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency