From 701118f4cd6c287303b6bbbb4d613bf06b21a3da Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Fri, 28 Sep 2012 12:04:01 +0300 Subject: [PATCH 1/1] Do now allow owner to leave group: remove link from group search --- snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html | 8 +++++--- snf-astakos-app/astakos/im/views.py | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html index 86f33af..01e2d5b 100644 --- a/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html +++ b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html @@ -91,9 +91,11 @@ {% if o.membership_approval_date %} Registered - + {% if not o.is_owner %} + + {% endif %} diff --git a/snf-astakos-app/astakos/im/views.py b/snf-astakos-app/astakos/im/views.py index fabcc62..a776f24 100644 --- a/snf-astakos-app/astakos/im/views.py +++ b/snf-astakos-app/astakos/im/views.py @@ -885,6 +885,12 @@ def group_search(request, extra_context=None, **kwargs): SELECT date_joined FROM im_membership WHERE group_id = im_astakosgroup.group_ptr_id AND person_id = %s) + THEN 1 ELSE 0 END""" % request.user.id, + 'is_owner': """ + SELECT CASE WHEN EXISTS( + SELECT id FROM im_astakosuser_owner + WHERE astakosgroup_id = im_astakosgroup.group_ptr_id + AND astakosuser_id = %s) THEN 1 ELSE 0 END""" % request.user.id}) if sorting: # TODO check sorting value -- 1.7.10.4