From a9282f503ac32a94909410f99203a4610ec2110d Mon Sep 17 00:00:00 2001 From: Rob Culliton Date: Thu, 17 May 2018 11:03:31 -0400 Subject: [PATCH] use owner login as a fallback for revoke card (can be different display name than rep owner) --- resources/sql/queries.sql | 1 + src/clj/commiteth/routes/services.clj | 1 + src/cljs/commiteth/manage_payouts.cljs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql index bdd2a98..1e08ff2 100644 --- a/resources/sql/queries.sql +++ b/resources/sql/queries.sql @@ -521,6 +521,7 @@ SELECT r.owner AS repo_owner, r.owner_avatar_url AS repo_owner_avatar_url, o.address AS owner_address, + o.login AS owner_login, u.address AS payout_address FROM users o, repositories r, issues i LEFT OUTER JOIN users u ON u.login = i.winner_login WHERE diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj index f6bb94a..ea4ca0f 100644 --- a/src/clj/commiteth/routes/services.clj +++ b/src/clj/commiteth/routes/services.clj @@ -76,6 +76,7 @@ :type :item-type :repo_name :repo-name :repo_owner :repo-owner + :owner_login :owner-login :issue_number :issue-number :issue_id :issue-id :value_usd :value-usd diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs index 3c68338..a9e48ac 100644 --- a/src/cljs/commiteth/manage_payouts.cljs +++ b/src/cljs/commiteth/manage_payouts.cljs @@ -328,7 +328,7 @@ "Paid out to " [:span.pg-med.fw5 "@" (or (:winner_login bounty) ;; use repo owner for revoked bounties ;; where no winner login is set - (:repo-owner bounty))]]] + (:owner-login bounty))]]] [small-card-balances bounty]]]) (defn expandable-bounty-list [bounty-component bounties]