refs #40 fixing memory leak

Author: sanak

lib/redmine_resource_manager/issue_patch.rb

@@ -24,6 +24,7 @@ def issue_human_resource_item_names
       cached_items = instance_variable_get("@issue_human_resource_items")
       if !cached_items.nil?
         IssueResourceItemsPresenter.new(cached_items).to_s
+        #instance_variable_set("@issue_human_resource_items", nil)
       else
         IssueResourceItemsPresenter.new(issue_human_resource_items).to_s
       end
@@ -32,6 +33,7 @@ def issue_asset_resource_item_names
       cached_items = instance_variable_get("@issue_asset_resource_items")
       if !cached_items.nil?
         IssueResourceItemsPresenter.new(cached_items).to_s
+        #instance_variable_set("@issue_asset_resource_items", nil)
       else
         IssueResourceItemsPresenter.new(issue_asset_resource_items).to_s
       end

lib/redmine_supply/issue_supply_items_presenter.rb

@@ -22,9 +22,7 @@ def to_s
 
     def issue_supply_item_tag(issue_supply_item)
       item = issue_supply_item.supply_item
-      # TODO: improve prealod cache logic
-      unit_name = @scope.nil? ? item.custom_values.first.value : item.unit_name
-      "#{h item.name} (#{h issue_supply_item.quantity} #{h unit_name})"
+      "#{h item.name} (#{h issue_supply_item.quantity} #{h item.unit_name})"
     end
   end
 end

lib/redmine_supply/patches/issue_patch.rb

@@ -25,6 +25,7 @@ def issue_supply_item_names
         cached_items = instance_variable_get("@issue_supply_items")
         if !cached_items.nil?
           IssueSupplyItemsPresenter.new(cached_items).to_s
+          #instance_variable_set("@issue_supply_items", nil)
         else
           IssueSupplyItemsPresenter.new(issue_supply_items).to_s
         end
@@ -72,7 +73,30 @@ def load_issue_supply_items(issues, user=User.current)
                                     order(:issue_id).
                                     order("#{SupplyItem.table_name}.name ASC").to_a
             issues.each do |issue|
-              issue.instance_variable_set "@issue_supply_items", _issue_supply_items.select {|s| s.issue_id == issue.id}
+              issue.instance_variable_set "@issue_supply_items",
+                                          _issue_supply_items.select {|s| s.issue_id == issue.id}.
+                                          map{|isi|
+                                            IssueSupplyItem.new(
+                                              id: isi.id,
+                                              issue: issue,
+                                              supply_item: SupplyItem.new(
+                                                              id: isi.supply_item.id,
+                                                              project: issue.project,
+                                                              name: isi.supply_item.name,
+                                                              description: isi.supply_item.description,
+                                                              unit: isi.supply_item.unit,
+                                                              stock: isi.supply_item.stock,
+                                                              custom_values: [CustomValue.new(
+                                                                id: isi.supply_item.custom_values.first.id,
+                                                                customized_type: "SupplyItem",
+                                                                customized_id: isi.supply_item.custom_values.first.customized_id,
+                                                                custom_field_id: isi.supply_item.custom_values.first.custom_field_id,
+                                                                value: isi.supply_item.custom_values.first.value
+                                                              )]
+                                                            ),
+                                              quantity: isi.quantity
+                                            )
+                                          }.compact
             end
           end
         end
@@ -84,7 +108,19 @@ def load_issue_human_resource_items(issues, user=User.current)
                                             where(resource_items: {type: "Human"}).
                                             where(:issue_id => issue_ids).to_a
             issues.each do |issue|
-              issue.instance_variable_set "@issue_human_resource_items", _issue_human_resource_items.select {|h| h.issue_id == issue.id}
+              issue.instance_variable_set "@issue_human_resource_items",
+                                          _issue_human_resource_items.select {|h| h.issue_id == issue.id}.
+                                          map{|iri|
+                                              IssueResourceItem.new(
+                                                issue: issue,
+                                                resource_item: Human.new(
+                                                                  id: iri.resource_item.id,
+                                                                  category_id: iri.resource_item.category_id,
+                                                                  name: iri.resource_item.name,
+                                                                  project: issue.project
+                                                                )
+                                              )
+                                          }.compact
             end
           end
         end
@@ -96,7 +132,14 @@ def load_issue_asset_resource_items(issues, user=User.current)
                                             where(resource_items: {type: "Asset"}).
                                             where(:issue_id => issue_ids).to_a
             issues.each do |issue|
-              issue.instance_variable_set "@issue_asset_resource_items", _issue_asset_resource_items.select {|a| a.issue_id == issue.id}
+              issue.instance_variable_set "@issue_asset_resource_items",
+                                          _issue_asset_resource_items.select {|a| a.issue_id == issue.id}.
+                                          map{|iri|
+                                            IssueResourceItem.new(
+                                              issue: issue,
+                                              resource_item: Asset.new(name: iri.resource_item.name)
+                                            )
+                                        }.compact
             end
           end
         end