Revision 6d583e07 snf-astakos-app/astakos/im/views/projects.py

b/snf-astakos-app/astakos/im/views/projects.py
55 55
import astakos.im.messages as astakos_messages
56 56

  
57 57
from astakos.im import tables
58
from astakos.im.models import ProjectApplication, ProjectMembership
58
from astakos.im.models import ProjectApplication, ProjectMembership, Project
59 59
from astakos.im.util import get_context, restrict_next
60 60
from astakos.im.forms import ProjectApplicationForm, AddProjectMembersForm, \
61 61
    ProjectSearchForm
62 62
from astakos.im.functions import check_pending_app_quota, accept_membership, \
63 63
    reject_membership, remove_membership, cancel_membership, leave_project, \
64 64
    join_project, enroll_member, can_join_request, can_leave_request, \
65
    get_related_project_id, get_by_chain_or_404, approve_application, \
65
    get_related_project_id, approve_application, \
66 66
    deny_application, cancel_application, dismiss_application
67 67
from astakos.im import settings
68 68
from astakos.im.util import redirect_back
......
307 307
        else:
308 308
            addmembers_form = AddProjectMembersForm()  # initialize form
309 309

  
310
        project, application = get_by_chain_or_404(chain_id)
310
        project = get_object_or_404(Project, pk=chain_id)
311
        application = project.application
311 312
        if project:
312 313
            members = project.projectmembership_set
313 314
            approved_members_count = project.members_count()
......
690 691
@valid_astakos_user_required
691 692
def project_members(request, chain_id, members_status_filter=None,
692 693
                    template_name='im/projects/project_members.html'):
693
    project, application = get_by_chain_or_404(chain_id)
694
    project = get_object_or_404(Project, pk=chain_id)
694 695

  
695 696
    user = request.user
696 697
    if not user.owns_project(project) and not user.is_project_admin():
......
715 716
        raise PermissionDenied
716 717

  
717 718
    member_ids = request.POST.getlist('members')
718
    project, application = get_by_chain_or_404(chain_id)
719
    project = get_object_or_404(Project, pk=chain_id)
719 720

  
720 721
    user = request.user
721 722
    if not user.owns_project(project) and not user.is_project_admin():

Also available in: Unified diff