Deploy fixes (#4922)

* change sum eth value * fix workplan showing in every activity
gitcoinco · Jul 31, 2019 · ef55e37 · ef55e37
1 parent 3cdc50e
commit ef55e37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/dashboard/models.py b/app/dashboard/models.py
@@ -2695,7 +2695,7 @@ def get_eth_sum(self, sum_type='collected', network='mainnet', bounties=None):
 
         try:
             if bounties.exists():
-                eth_sum = sum([amount for amount in bounties.values_list("value_in_eth", flat=True)])
+                eth_sum = sum([amount for amount in bounties.values_list("value_true", flat=True)])
         except Exception:
             pass
 
@@ -2812,7 +2812,7 @@ def get_various_activities(self):
             (dashboard.models.ActivityQuerySet): The query results.
 
         """
-        
+
         if not self.is_org:
             all_activities = self.activities
         else:

diff --git a/app/dashboard/templates/bounty/details.html b/app/dashboard/templates/bounty/details.html
@@ -399,7 +399,7 @@ <h5 class="bounty-heading">{% trans "Funder" %}</h5>
           <div class="col-12 col-md-2">
             <div class="activity-time">[[:age]]</div>
           </div>
-          [[if issue_message]]
+          [[if issue_message && activity_type == 'worker_applied']]
             <p class="bg-lightblue p-2 rounded mt-3 mb-0 w-100 overflow-auto" style="resize: vertical;height: 50px;word-break: break-word;white-space: pre-wrap;"><b>Work Plan:</b> [[:issue_message.issue_message]]</p>
           [[/if]]
         </div>