Merge branch 'release/teamrequestsfix'

rowers/teams.py

@@ -403,7 +403,7 @@ def process_invite_code(user,code):
     
     t = invitation.team
     result = add_member(t.id,r)
-    send_invite_accept_email(invitation.id)
+    send_invite_accept_email(invitation)
     invitation.delete()
     return result
 

rowers/templates/teams.html

@@ -38,7 +38,7 @@
     
   </div>
   <div class="grid_6 omega">
-    {% if invites or requests or myrequests %}
+    {% if invites or requests or myrequests or myinvites %}
     <p>
       <h2>Invitations and Requests</h2>
       <table width="90%" class="listtable">
@@ -77,13 +77,28 @@
           <tr>
             <td><a href="/rowers/team/{{ i.team.id }}">{{ i.team.name }}</a></td>
             <td>{{ i.team.manager.first_name }} {{ i.team.manager.last_name }}</td>
-            <td>{{ user.first_name }} {{ user.last_name }}</td>
+            <td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
             <td><a class="button small green" href="/rowers/me/request/{{ i.code }}">Accept</a>
             <td>
               <a class="button small red" href="/rowers/me/request/{{ i.id }}/reject">Reject</a>
             </td>
           </tr>
           {% endfor %}
+          {% for i in myinvites %}
+          <tr>
+            <td><a href="/rowers/team/{{ i.team.id }}">{{ i.team.name }}</a></td>
+            <td>{{ i.team.manager.first_name }} {{ i.team.manager.last_name }}</td>
+            {% if i.user %}
+            <td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
+            {% else %}
+            <td>{{ i.email }}</td>
+            {% endif %}
+            <td>&nbsp;
+            <td>
+              <a class="button small red" href="/rowers/me/invitation/{{ i.id }}/revoke">Revoke</a>
+            </td>
+          </tr>
+          {% endfor %}
         </tbody>
         </table>
     </p>

rowers/urls.py

@@ -215,7 +215,7 @@ urlpatterns = [
     url(r'^team/create/$',views.team_create_view),
     url(r'^me/team/(\d+)/drop/(\d+)$',views.manager_member_drop_view),
     url(r'^me/invitation/(\d+)/reject$',views.invitation_reject_view),
-    url(r'^me/invitation/c/(?P<message>\w+.*)/$',views.rower_invitations_view),
+    url(r'^me/invitation/(\d+)/revoke$',views.invitation_revoke_view),
     url(r'^me/invitation/$',views.rower_invitations_view),
     url(r'^me/invitation/(\w+.*)/$',views.rower_invitations_view),
     url(r'^me/request/c/(?P<message>\w+.*)/$',views.manager_requests_view),

rowers/views.py

@@ -5378,6 +5378,7 @@ def rower_teams_view(request,message='',successmessage=''):
 
     invites = TeamInvite.objects.filter(user=request.user)
     requests = TeamRequest.objects.filter(user=request.user)
+    myrequests = TeamRequest.objects.filter(team__in=myteams)
     myinvites = TeamInvite.objects.filter(team__in=myteams)
     
     return render(request, 'teams.html',
@@ -5389,7 +5390,23 @@ def rower_teams_view(request,message='',successmessage=''):
                       'requests':requests,
                       'myrequests':myrequests,
                       'message':message,
+                      'successmessage':successmessage,
                       'myinvites':myinvites,
+		  })
+@user_passes_test(iscoachmember,login_url="/",redirect_field_name=None)
+def invitation_revoke_view(request,id):
+    res,text = teams.revoke_invite(request.user,id)
+    if res:
+        successmessage = text
+        url = reverse(rower_teams_view,kwargs={
+            'successmessage':successmessage
+            })
+    else:
+        message = text
+        url = reverse(rower_teams_view,kwargs={
+            'message':message
+            })
+
     return HttpResponseRedirect(url)
 
 @user_passes_test(iscoachmember,login_url="/",redirect_field_name=None)