Revision e6d284ef

b/snf-astakos-app/astakos/im/models.py
1160 1160
            try:
1161 1161
                membership = self.project.projectmembership_set.get(person=user)
1162 1162
                status = membership.state
1163
            except Project.DoesNotExist:
1164
                status = -1
1163 1165
            except ProjectMembership.DoesNotExist:
1164 1166
                status = -1
1165 1167

  
b/snf-astakos-app/astakos/im/tables.py
34 34
    name = tables.LinkColumn('astakos.im.views.project_detail', args=(A('pk'),))
35 35
    issue_date = tables.DateColumn(format=DEFAULT_DATE_FORMAT)
36 36
    start_date = tables.DateColumn(format=DEFAULT_DATE_FORMAT)
37
    state = tables.Column(verbose_name="Status")
37
    membership_status = tables.Column(verbose_name=_("Status"), empty_values=(),
38
                                      orderable=False)
38 39
    members_count = tables.Column(verbose_name=_("Enrolled"), default=0,
39 40
                                  sortable=False)
40
    membership_status = tables.Column(verbose_name=_("My status"), empty_values=(),
41
                                      orderable=False)
41
    
42 42

  
43 43

  
44
    def render_membership_status(self, *args, **kwargs):
45
        return MEMBER_STATUS_DISPLAY.get(kwargs.get('record').member_status(self.user))
44
    def render_membership_status(self, record, *args, **kwargs):
45
        status = record.member_status(self.user)
46
        if status == 100:
47
            return record.state
48
        else:
49
            return MEMBER_STATUS_DISPLAY.get(status, 'Unknown')
46 50

  
47 51
    class Meta:
48 52
        model = ProjectApplication
49
        fields = ('name', 'membership_status', 'issue_date', 'start_date',
50
                  'state', 'members_count')
53
        fields = ('name', 'membership_status', 'issue_date', 'start_date', 'members_count')
51 54
        attrs = {'id': 'projects-list', 'class': 'my-projects alt-style'}
52 55
        caption = _('My projects')
53 56
        template = "im/table_render.html"
b/snf-astakos-app/astakos/im/views.py
1111 1111
    projects = ProjectApplication.objects.user_projects(request.user).select_related()
1112 1112
    table = tables.UserProjectApplicationsTable(projects, user=request.user,
1113 1113
                                                prefix="my_projects_")
1114
    RequestConfig(request).configure(table)
1114
    RequestConfig(request, paginate={"per_page": PAGINATE_BY}).configure(table)
1115 1115

  
1116 1116
    return object_list(
1117 1117
        request,
......
1193 1193
    members = application.project.projectmembership_set.select_related()
1194 1194
    members_table = tables.ProjectApplicationMembersTable(members,
1195 1195
                                                          prefix="members_")
1196
    RequestConfig(request).configure(members_table)
1196
    RequestConfig(request, paginate={"per_page": PAGINATE_BY}).configure(members_table)
1197 1197

  
1198 1198
    try:
1199 1199
        return object_detail(
......
1238 1238

  
1239 1239
    table = tables.UserProjectApplicationsTable(projects, user=request.user,
1240 1240
                                                prefix="my_projects_")
1241
    RequestConfig(request).configure(table)
1241
    RequestConfig(request, paginate={"per_page": PAGINATE_BY}).configure(table)
1242 1242

  
1243 1243
    return object_list(
1244 1244
        request,

Also available in: Unified diff