Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy fixes #4922

Merged
merged 2 commits into from
Jul 31, 2019
Merged

Deploy fixes #4922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d93d993
change sum eth value
octavioamu Jul 31, 2019
95e991e
fix workplan showing in every activity
octavioamu Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/dashboard/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/bounty/details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down