[myexperiment-hackers] [2912] trunk/app/models: Fixed issue with solr stopping a pack with entries from being deleted

[noreply]

Revision

2912

Author

fbacall

Date

2012-01-20 09:51:41 -0500 (Fri, 20 Jan 2012)

Log Message

Fixed issue with solr stopping a pack with entries from being deleted

Modified Paths

• trunk/app/models/pack_contributable_entry.rb
• trunk/app/models/pack_remote_entry.rb

Diff

Modified: trunk/app/models/pack_contributable_entry.rb (2911 => 2912)

--- trunk/app/models/pack_contributable_entry.rb	2012-01-20 13:25:30 UTC (rev 2911)
+++ trunk/app/models/pack_contributable_entry.rb	2012-01-20 14:51:41 UTC (rev 2912)
@@ -75,6 +75,6 @@
   end
 
   def touch_pack
-    pack.touch unless pack.destroyed?
+    pack.touch unless (pack.destroyed? || pack.contribution.nil?)
   end
 end

Modified: trunk/app/models/pack_remote_entry.rb (2911 => 2912)

--- trunk/app/models/pack_remote_entry.rb	2012-01-20 13:25:30 UTC (rev 2911)
+++ trunk/app/models/pack_remote_entry.rb	2012-01-20 14:51:41 UTC (rev 2912)
@@ -28,7 +28,7 @@
   end
 
   def touch_pack
-    pack.touch unless pack.destroyed?
+    pack.touch unless (pack.destroyed? || pack.contribution.nil?)
   end
 
   def available?