Merge pull request #2173 from gittip/1126-show-teams-on-history-page

History page: show tipper if it's a team you're a member of

branch.sql

@@ -0,0 +1,24 @@
+BEGIN;
+
+    ALTER TABLE transfers ADD COLUMN as_team_member boolean NOT NULL DEFAULT false;
+
+    UPDATE transfers
+       SET as_team_member = true
+     WHERE amount <= (
+               SELECT amount
+                 FROM takes
+                WHERE takes.team = transfers.tipper
+                  AND takes.member = transfers.tippee
+                  AND takes.ctime < transfers.timestamp
+             ORDER BY takes.ctime DESC
+                LIMIT 1
+           )
+       AND amount != (
+               SELECT amount
+                 FROM tips
+                WHERE tips.ctime < transfers.timestamp
+             ORDER BY tips.ctime DESC
+                LIMIT 1
+           );
+
+END;

gittip/billing/payday.py

@@ -454,7 +454,7 @@ def transfer(self, tipper, tippee, amount, pachinko=False):
                 return False
 
             self.credit_participant(cursor, tippee, amount)
-            self.record_transfer(cursor, tipper, tippee, amount)
+            self.record_transfer(cursor, tipper, tippee, amount, pachinko)
             if pachinko:
                 self.mark_pachinko(cursor, amount)
             else:
@@ -835,14 +835,14 @@ def record_credit(self, amount, fee, error, username):
                                     ))
 
 
-    def record_transfer(self, cursor, tipper, tippee, amount):
+    def record_transfer(self, cursor, tipper, tippee, amount, as_team_member=False):
         cursor.run("""\
 
           INSERT INTO transfers
-                      (tipper, tippee, amount)
-               VALUES (%s, %s, %s)
+                      (tipper, tippee, amount, as_team_member)
+               VALUES (%s, %s, %s, %s)
 
-        """, (tipper, tippee, amount))
+        """, (tipper, tippee, amount, as_team_member))
 
 
     def mark_missing_funding(self):

www/%username/history/index.html.spt

@@ -275,7 +275,7 @@ locked = False
         <td class="balance">{{ event['balance'] }}</td>
 
         {% if event['tippee'] == participant.username %}
-            {% if user.ADMIN and (participant != user.participant or 'override' in qs) %}
+            {% if event['as_team_member'] or user.ADMIN and (participant != user.participant or 'override' in qs) %}
             <td class="notes">from <a href="/{{ event['tipper'] }}/history/">{{ event['tipper'] }}</a></td>
             {% else %}
             <td class="notes">from someone</td>