acts_as_data_owner 0.0.4 → 0.0.5

data/lib/acts_as_data_owner/active_record.rb

@@ -1,6 +1,9 @@
 # -*- encoding: utf-8 -*-
+
+
 module ActsAsDataOwner
 
+
   def acts_as_data_owner(*args)
 
     options = args.extract_options!
@@ -22,13 +25,18 @@ module ActsAsDataOwner
     before_update :set_updater
 
     scope :current, lambda {
+      conditions = {}
       #Filter by User Ids Who has access to Products
       if !Person.current.is_admin?
-        conditions = {}
-        conditions["#{self.table_name}.creator_id"] = ([Person.current.id] + Person.manage_people_ids).compact if fields.include?(:creator)
-        conditions["#{self.table_name}.company_id"] = ([(Person.current.current_company ? Person.current.current_company.id : nil)] + Person.manage_company_ids).compact if fields.include?(:company)
-        where(conditions)
+
+        conditions["#{self.table_name}.owner_id"] = ([Person.current.id] + Person.manage_people_ids).compact if fields.include?(:owner)
+
+        if fields.include?(:company)
+          company_ids = ([(Person.current.current_company ? Person.current.current_company.id : nil)] + Person.manage_company_ids).compact
+          conditions["#{self.table_name}.company_id"] = company_ids if company_ids.any?
+        end
       end
+      where(conditions)
     }
 
 

data/lib/acts_as_data_owner/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module ActsAsDataOwner
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_data_owner
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000Z
+date: 2012-05-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails