Skip to content

Commit 0069fbf

Browse files
committed
Fixed invitation bug
1 parent e8ae8fe commit 0069fbf

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

review/tables.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,11 @@ class ApplicationInviteTable(ApplicationTable):
4545

4646
class Meta(ApplicationTable.Meta):
4747
fields = ('select', 'full_name', 'user.email', 'status', 'votes', 'vote_avg', 'last_modified', 'detail')
48+
49+
50+
class ApplicationInviteTableWithPromotion(ApplicationInviteTable):
51+
promotional_code = tables.TemplateColumn(template_name='tables/promotional_code.html')
52+
53+
class Meta(ApplicationTable.Meta):
54+
fields = ('select', 'full_name', 'user.email', 'status', 'promotional_code', 'votes', 'vote_avg',
55+
'last_modified', 'detail')

review/views.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
from review.filters import ApplicationTableFilter, ApplicationTableFilterWithPromotion
2929
from review.forms import CommentForm, DubiousApplicationForm
3030
from review.models import Vote, FileReview
31-
from review.tables import ApplicationTable, ApplicationInviteTable, ApplicationTableWithPromotion
31+
from review.tables import ApplicationTable, ApplicationInviteTable, ApplicationTableWithPromotion, \
32+
ApplicationInviteTableWithPromotion
3233
from user.mixins import IsOrganizerMixin
3334
from user.models import BlockedUser
3435

@@ -63,12 +64,13 @@ def get_current_tabs(self, **kwargs):
6364
class ApplicationList(IsOrganizerMixin, ReviewApplicationTabsMixin, SingleTableMixin, FilterView):
6465
template_name = 'application_list.html'
6566
table_class = ApplicationTable
67+
table_class_with_promotion = ApplicationTableWithPromotion
6668
table_pagination = {'per_page': 50}
6769
filterset_class = ApplicationTableFilter
6870

6971
def get_table_class(self):
7072
if PromotionalCode.active():
71-
return ApplicationTableWithPromotion
73+
return self.table_class_with_promotion
7274
return super().get_table_class()
7375

7476
def get_filterset_class(self):
@@ -250,6 +252,7 @@ def get_context_data(self, **kwargs):
250252

251253
class ApplicationListInvite(ApplicationPermissionRequiredMixin, ApplicationList):
252254
table_class = ApplicationInviteTable
255+
table_class_with_promotion = ApplicationInviteTableWithPromotion
253256
permission_required = 'application.can_invite_application'
254257

255258
def get_current_tabs(self, **kwargs):

0 commit comments

Comments
 (0)