diff --git a/rrequests/views.py b/rrequests/views.py index 8e3ad54..d15c264 100644 --- a/rrequests/views.py +++ b/rrequests/views.py @@ -14,7 +14,7 @@ from .forms import RequestForm, ResponseForm, ProviderResponseForm @login_required def listRequests(request): mnts = request.user.maintainer_set.all() - requestedFromMe = Request.objects.filter(applicant=mnts) + requestedFromMe = Request.objects.filter(applicant__in=mnts) requestedToMe = Request.objects.filter(provider__in=mnts) requests = (requestedFromMe | requestedToMe).order_by("-lastAction") @@ -60,9 +60,11 @@ def rrequestDetail(request, pk): mnts = request.user.maintainer_set.all() formClass = None provider = None + initialFormData = {} if reqObj.provider in mnts: provider = True formClass = ProviderResponseForm + initialFormData["createdResources"] = reqObj.grantedResources else: provider = False formClass = ResponseForm @@ -92,7 +94,7 @@ def rrequestDetail(request, pk): return HttpResponseRedirect(reverse("rrequests:show", args=(pk,))) else: - form = formClass(request=reqObj, user=request.user) + form = formClass(request=reqObj, user=request.user, initial=initialFormData) return render(request, "rrequests/request_detail.html", {"request": reqObj, "form": form}) diff --git a/templates/rrequests/request_detail.html b/templates/rrequests/request_detail.html index 08ad9d0..94ced31 100644 --- a/templates/rrequests/request_detail.html +++ b/templates/rrequests/request_detail.html @@ -24,6 +24,11 @@ {% endif %} {% endfor %} + {% if request.grantedResources %} + + {% endif %}

Add / change