Revision 6d583e07 snf-astakos-app/astakos/im/tables.py
b/snf-astakos-app/astakos/im/tables.py | ||
---|---|---|
185 | 185 |
append_url = '' |
186 | 186 |
|
187 | 187 |
can_join = can_leave = can_cancel = False |
188 |
project = application.get_project()
|
|
188 |
project = application.chain
|
|
189 | 189 |
|
190 |
if project and project.is_approved():
|
|
190 |
if project.is_active():
|
|
191 | 191 |
try: |
192 | 192 |
join_project_checks(project) |
193 | 193 |
can_join = True |
... | ... | |
228 | 228 |
confirm = False |
229 | 229 |
url = None |
230 | 230 |
|
231 |
url = reverse(url, args=(application.chain, )) + append_url if url else '' |
|
231 |
url = reverse(url, args=(application.chain_id, )) + append_url if url else ''
|
|
232 | 232 |
|
233 | 233 |
return {'action': action, |
234 | 234 |
'confirm': confirm, |
... | ... | |
264 | 264 |
name = LinkColumn('astakos.im.views.project_detail', |
265 | 265 |
coerce=lambda x: truncatename(x, 25), |
266 | 266 |
append=project_name_append, |
267 |
args=(A('chain'),)) |
|
267 |
args=(A('chain_id'),))
|
|
268 | 268 |
issue_date = tables.DateColumn(verbose_name=_('Application'), |
269 | 269 |
format=DEFAULT_DATE_FORMAT) |
270 | 270 |
start_date = tables.DateColumn(format=DEFAULT_DATE_FORMAT) |
... | ... | |
292 | 292 |
def render_members_count(self, record, *args, **kwargs): |
293 | 293 |
append = "" |
294 | 294 |
application = record |
295 |
project = application.get_project()
|
|
295 |
project = application.chain
|
|
296 | 296 |
if project is None: |
297 | 297 |
append = mark_safe("<i class='tiny'>%s</i>" % (_('pending'),)) |
298 | 298 |
|
... | ... | |
300 | 300 |
if c > 0: |
301 | 301 |
pending_members_url = reverse( |
302 | 302 |
'project_pending_members', |
303 |
kwargs={'chain_id': application.chain}) |
|
303 |
kwargs={'chain_id': application.chain_id})
|
|
304 | 304 |
|
305 | 305 |
pending_members = "<i class='tiny'> - %d %s</i>" % ( |
306 | 306 |
c, _('pending')) |
... | ... | |
313 | 313 |
(pending_members_url, c, _('pending'))) |
314 | 314 |
append = mark_safe(pending_members) |
315 | 315 |
members_url = reverse('project_approved_members', |
316 |
kwargs={'chain_id': application.chain}) |
|
316 |
kwargs={'chain_id': application.chain_id})
|
|
317 | 317 |
members_count = record.members_count() |
318 | 318 |
if self.user.owns_application(record) or self.user.is_project_admin(): |
319 | 319 |
members_count = '<a href="%s">%d</a>' % (members_url, |
Also available in: Unified diff