lockdown 1.1.2 → 1.1.3

data/lib/lockdown/helper.rb

@@ -18,6 +18,18 @@ module Lockdown
       underscore(Lockdown::System.fetch(:user_group_model).to_s).pluralize.to_sym
     end
 
+    def user_group_id_reference
+      underscore(Lockdown::System.fetch(:user_group_model).to_s)
+    end
+
+    def users_hbtm_reference
+      underscore(Lockdown::System.fetch(:user_model).to_s).pluralize.to_sym
+    end
+
+    def user_id_reference
+      underscore(Lockdown::System.fetch(:user_model).to_s)
+    end
+
     def get_string(value)
       if value.respond_to?(:name)
         string_name(value.name)

data/lib/lockdown/rules.rb

@@ -209,17 +209,23 @@ module Lockdown
     # him/her self.
     def user_groups_assignable_for_user(usr)
       return [] if usr.nil?
-        
+      ug_table = Lockdown.user_groups_hbtm_reference.to_s
       if administrator?(usr)
         Lockdown::System.fetch(:user_group_model).find_by_sql <<-SQL
-          select user_groups.* from user_groups order by user_groups.name
+          select #{ug_table}.* from #{ug_table} order by #{ug_table}.name
         SQL
       else
+        usr_table = Lockdown.users_hbtm_reference.to_s
+        if usr_table < ug_table
+          join_table = "#{usr_table}_#{ug_table}"
+        else
+          join_table = "#{ug_table}_#{usr_table}"
+        end
         Lockdown::System.fetch(:user_group_model).find_by_sql <<-SQL
-            select user_groups.* from user_groups, user_groups_users
-             where user_groups.id = user_groups_users.user_group_id
-             and user_groups_users.user_id = #{usr.id}	 
-             order by user_groups.name
+            select #{ug_table}.* from #{ug_table}, #{join_table}
+             where #{ug_table}.id = #{join_table}.#{Lockdown.user_group_id_reference}
+             and #{join_table}.#{Lockdown.user_id_reference} = #{usr.id}	 
+             order by #{ug_table}.name
         SQL
       end
     end

data/lib/lockdown.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), "lockdown", "helper")
 module Lockdown
   extend Lockdown::Helper
 
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 
   # Returns the version string for the library.
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Andrew Stone