From d7ba82adc1b08f896442845fe9aaca84de8a367a Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Tue, 9 Jun 2026 09:48:33 +0200 Subject: [PATCH 1/6] First stab at alloing a submission to have more than one project. --- hypha/apply/activity/services.py | 11 +- .../messages/email/assign_paf_approvers.html | 2 +- .../messages/email/paf_for_approval.html | 2 +- .../email/project_final_approval.html | 2 +- .../messages/email/sent_to_compliance.html | 2 +- .../apply/determinations/tests/test_views.py | 32 ++--- hypha/apply/determinations/views.py | 6 +- hypha/apply/funds/forms.py | 4 +- .../funds/applicationsubmission_detail.html | 23 ++-- .../apply/funds/templates/funds/comments.html | 25 ++-- .../funds/includes/admin_primary_actions.html | 8 +- .../funds/includes/co-applicant-block.html | 2 +- .../funds/includes/submission-list-row.html | 4 +- .../funds/includes/submission-table-row.html | 4 +- hypha/apply/funds/tests/test_views.py | 13 +- hypha/apply/funds/urls.py | 13 +- hypha/apply/projects/forms/project.py | 12 +- ...roject_options_alter_project_submission.py | 31 +++++ hypha/apply/projects/models/project.py | 30 +++-- hypha/apply/projects/reports/tables.py | 2 +- .../templates/reports/includes/reports.html | 4 +- hypha/apply/projects/reports/views.py | 2 +- hypha/apply/projects/tables.py | 7 +- .../includes/contracting_documents.html | 18 +-- .../includes/invoices.html | 2 +- .../includes/project_documents.html | 30 ++--- .../includes/project_header.html | 4 +- .../application_projects/invoice_detail.html | 4 +- .../modals/approve_contract.html | 2 +- .../contracting_category_documents.html | 14 +-- .../partials/invoice_detail_actions.html | 4 +- .../partials/invoice_status_table.html | 4 +- .../partials/project_information.html | 8 +- .../partials/project_lead.html | 4 +- .../partials/project_title.html | 4 +- .../partials/supporting_documents.html | 10 +- .../project_admin_detail.html | 4 +- .../project_approval_detail.html | 18 +-- .../application_projects/project_detail.html | 4 +- .../project_sow_detail.html | 6 +- .../submission_projects.html | 46 +++++++ hypha/apply/projects/tests/test_forms.py | 28 +++++ hypha/apply/projects/tests/test_models.py | 16 +++ hypha/apply/projects/tests/test_views.py | 115 ++++++++++++------ hypha/apply/projects/urls.py | 7 +- hypha/apply/projects/views/__init__.py | 2 + hypha/apply/projects/views/payment.py | 8 +- hypha/apply/projects/views/project.py | 101 ++++++++++----- .../apply/projects/views/project_partials.py | 10 +- 49 files changed, 472 insertions(+), 242 deletions(-) create mode 100644 hypha/apply/projects/migrations/0104_alter_project_options_alter_project_submission.py create mode 100644 hypha/apply/projects/templates/application_projects/submission_projects.html diff --git a/hypha/apply/activity/services.py b/hypha/apply/activity/services.py index 1eff7ae1c9..1babce10ee 100644 --- a/hypha/apply/activity/services.py +++ b/hypha/apply/activity/services.py @@ -75,14 +75,13 @@ def get_related_activities_for_user(obj, user): Returns: [`Activity`][hypha.apply.activity.models.Activity] queryset """ - if hasattr(obj, "project") and obj.project: - if ( - obj.co_applicants.filter(user=user).exists() - and not obj.co_applicants.filter(user=user).first().project_permission - ): + if hasattr(obj, "projects"): + # obj is an ApplicationSubmission, which may have several projects. + co_applicant = obj.co_applicants.filter(user=user).first() + if co_applicant and not co_applicant.project_permission: source_filter = Q(submission=obj) else: - source_filter = Q(submission=obj) | Q(project=obj.project) + source_filter = Q(submission=obj) | Q(project__in=obj.projects.all()) elif hasattr(obj, "submission") and obj.submission: source_filter = Q(submission=obj.submission) | Q(project=obj) else: diff --git a/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html b/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html index 0275bee9b4..22df57998f 100644 --- a/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html +++ b/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html @@ -7,7 +7,7 @@ {% trans "Project documents are ready to be assigned for approval." %} {% trans "Title" %}: {{ source.title_text_display }} -{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.submission.pk %} +{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %} {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %} {% endblock %}{# fmt:on #} diff --git a/hypha/apply/activity/templates/messages/email/paf_for_approval.html b/hypha/apply/activity/templates/messages/email/paf_for_approval.html index bbf533da29..c15f334ad0 100644 --- a/hypha/apply/activity/templates/messages/email/paf_for_approval.html +++ b/hypha/apply/activity/templates/messages/email/paf_for_approval.html @@ -6,7 +6,7 @@ {% block content %}{# fmt:off #} {% blocktrans with title=source.title_text_display %}The {{ title }} project is awaiting your review.{% endblocktrans %} -{% trans "View the project here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.submission.pk %} +{% trans "View the project here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %} {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %} {% endblock %}{# fmt:on #} diff --git a/hypha/apply/activity/templates/messages/email/project_final_approval.html b/hypha/apply/activity/templates/messages/email/project_final_approval.html index f1ba5720e6..253048f0a0 100644 --- a/hypha/apply/activity/templates/messages/email/project_final_approval.html +++ b/hypha/apply/activity/templates/messages/email/project_final_approval.html @@ -6,7 +6,7 @@ {% block content %}{# fmt:off #} {% blocktrans with title=source.title_text_display %}The project "{{title}}" is awaiting final approval.{% endblocktrans %} -{% trans "Approve the project here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.submission.pk %} +{% trans "Approve the project here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %} {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %} {% endblock %}{# fmt:on #} diff --git a/hypha/apply/activity/templates/messages/email/sent_to_compliance.html b/hypha/apply/activity/templates/messages/email/sent_to_compliance.html index 5a0efb6f49..51e3a425f1 100644 --- a/hypha/apply/activity/templates/messages/email/sent_to_compliance.html +++ b/hypha/apply/activity/templates/messages/email/sent_to_compliance.html @@ -6,7 +6,7 @@ {% block content %}{# fmt:off #} {% blocktrans with title=source.title_text_display %}The project "{{ title }}" is awaiting your review.{% endblocktrans %} -{% trans "View the project here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.submission.pk %} +{% trans "View the project here" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %} {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %} {% endblock %}{# fmt:on #} diff --git a/hypha/apply/determinations/tests/test_views.py b/hypha/apply/determinations/tests/test_views.py index 17e60607e7..598628e123 100644 --- a/hypha/apply/determinations/tests/test_views.py +++ b/hypha/apply/determinations/tests/test_views.py @@ -202,8 +202,10 @@ def test_first_stage_accepted_determination_does_not_create_project(self): # Confirm a Project was not created for either submission since it's # not in the final stage of its workflow. - self.assertFalse(hasattr(submission_original, "project")) - self.assertFalse(hasattr(submission_next, "project")) + self.assertFalse(submission_original.projects.exists()) + self.assertFalse( + submission_next.projects.exists() if submission_next else False + ) def test_first_stage_rejected_determination_does_not_create_project(self): submission = ApplicationSubmissionFactory( @@ -232,7 +234,7 @@ def test_first_stage_rejected_determination_does_not_create_project(self): # Confirm a Project was not created for the original # ApplicationSubmission. - self.assertFalse(hasattr(submission_original, "project")) + self.assertFalse(submission_original.projects.exists()) def test_second_stage_accepted_determination_creates_project(self): submission = ApplicationSubmissionFactory( @@ -260,8 +262,10 @@ def test_second_stage_accepted_determination_creates_project(self): # applications flow. self.assertIsNone(submission_next) - self.assertTrue(hasattr(submission_original, "project")) - self.assertFalse(hasattr(submission_next, "project")) + self.assertTrue(submission_original.projects.exists()) + self.assertFalse( + submission_next.projects.exists() if submission_next else False + ) def test_second_stage_rejected_determination_does_not_create_project(self): submission = ApplicationSubmissionFactory( @@ -288,7 +292,7 @@ def test_second_stage_rejected_determination_does_not_create_project(self): # applications flow. self.assertIsNone(submission_next) - self.assertFalse(hasattr(submission_original, "project")) + self.assertFalse(submission_original.projects.exists()) def test_single_stage_accepted_determination_creates_project(self): submission = ApplicationSubmissionFactory( @@ -312,7 +316,7 @@ def test_single_stage_accepted_determination_creates_project(self): submission_next = submission_original.next self.assertIsNone(submission_next) - self.assertTrue(hasattr(submission_original, "project")) + self.assertTrue(submission_original.projects.exists()) def test_single_stage_rejected_determination_does_not_create_project(self): submission = ApplicationSubmissionFactory( @@ -336,7 +340,7 @@ def test_single_stage_rejected_determination_does_not_create_project(self): submission_next = submission_original.next self.assertIsNone(submission_next) - self.assertFalse(hasattr(submission_original, "project")) + self.assertFalse(submission_original.projects.exists()) @override_settings(PROJECTS_DEFAULT_STATUS="contracting") def test_auto_creation_uses_status_settings(self): @@ -357,8 +361,8 @@ def test_auto_creation_uses_status_settings(self): ) submission_original = self.refresh(submission) - self.assertTrue(hasattr(submission_original, "project")) - self.assertEqual(submission.project.status, CONTRACTING) + self.assertTrue(submission_original.projects.exists()) + self.assertEqual(submission.projects.first().status, CONTRACTING) @override_settings(PROJECTS_DEFAULT_STATUS="garbage") def test_auto_creation_uses_draft_when_invalid_status_settings(self): @@ -379,8 +383,8 @@ def test_auto_creation_uses_draft_when_invalid_status_settings(self): ) submission_original = self.refresh(submission) - self.assertTrue(hasattr(submission_original, "project")) - self.assertEqual(submission.project.status, DRAFT) + self.assertTrue(submission_original.projects.exists()) + self.assertEqual(submission.projects.first().status, DRAFT) @override_settings(PROJECTS_AUTO_CREATE=False) def test_disabling_project_auto_creation_stops_projects_being_created(self): @@ -405,7 +409,7 @@ def test_disabling_project_auto_creation_stops_projects_being_created(self): submission_next = submission_original.next self.assertIsNone(submission_next) - self.assertFalse(hasattr(submission_original, "project")) + self.assertFalse(submission_original.projects.exists()) @override_settings(PROJECTS_ENABLED=False, PROJECTS_AUTO_CREATE=True) def test_disabling_projects_ignores_auto_creation_setting(self): @@ -430,7 +434,7 @@ def test_disabling_projects_ignores_auto_creation_setting(self): submission_next = submission_original.next self.assertIsNone(submission_next) - self.assertFalse(hasattr(submission_original, "project")) + self.assertFalse(submission_original.projects.exists()) class BatchDeterminationTestCase(BaseViewTestCase): diff --git a/hypha/apply/determinations/views.py b/hypha/apply/determinations/views.py index b1e0a486f4..f686db873c 100644 --- a/hypha/apply/determinations/views.py +++ b/hypha/apply/determinations/views.py @@ -459,7 +459,11 @@ def form_valid(self, form): proposal_form=proposal_form, ) - if self.submission.accepted_for_funding and settings.PROJECTS_AUTO_CREATE: + if ( + self.submission.accepted_for_funding + and settings.PROJECTS_AUTO_CREATE + and not self.submission.projects.exists() + ): Project.create_from_submission(self.submission) messages.success( self.request, _("A project was automatically created.") diff --git a/hypha/apply/funds/forms.py b/hypha/apply/funds/forms.py index 82cb806f10..4f94a85e6e 100644 --- a/hypha/apply/funds/forms.py +++ b/hypha/apply/funds/forms.py @@ -472,7 +472,7 @@ def __init__(self, *args, submission, user=None, **kwargs): if submission: self.fields["submission"].initial = submission.id - if not hasattr(submission, "project"): + if not submission.projects.exists(): self.fields.pop("project_permission", None) class Meta: @@ -497,7 +497,7 @@ class EditCoApplicantForm(forms.ModelForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) instance = kwargs.get("instance", None) - if not hasattr(instance.submission, "project"): + if not instance.submission.projects.exists(): self.fields.pop("project_permission", None) class Meta: diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html index 59e4f680a7..6c3042edd6 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html @@ -8,11 +8,7 @@ {% block hero %} - {% if object.project %} - {% include "application_projects/includes/project_header.html" with object=object.project %} - {% else %} - {% include "funds/includes/application_header.html" %} - {% endif %} + {% include "funds/includes/application_header.html" %}
- {% if PROJECTS_ENABLED and object.project %} - {% user_can_access_project object.project user as can_access_project %} - {% if can_access_project %} - - {% trans "Project" %} - - {% endif %} + {% if PROJECTS_ENABLED and object.projects.exists %} + + {% blocktrans count counter=object.projects.count %}Project{% plural %}Projects ({{ counter }}){% endblocktrans %} + {% endif %} - {% if object.project %} - {% include "application_projects/includes/project_header.html" with object=object.project %} - {% else %} - {% include "funds/includes/application_header.html" %} - {% endif %} + {% include "funds/includes/application_header.html" %}
- {% if PROJECTS_ENABLED and object.project %} - {% user_can_access_project object.project user as can_access_project %} - {% if can_access_project %} - - {% trans "Project" %} - - {% endif %} + {% if PROJECTS_ENABLED and object.projects.exists %} + + {% blocktrans count counter=object.projects.count %}Project{% plural %}Projects ({{ counter }}){% endblocktrans %} + {% endif %} {% if form %} - {% if not object.is_archive or object.project %} + {% if not object.is_archive or object.projects.exists %}

{% trans "Add communication" %}

{% trans "Actions to take" %} {% else %}
{% if PROJECTS_ENABLED %} - {% if object.accepted_for_funding and not object.project %} + {% if object.accepted_for_funding %} {% endif %} {% endif %} diff --git a/hypha/apply/funds/templates/funds/includes/co-applicant-block.html b/hypha/apply/funds/templates/funds/includes/co-applicant-block.html index f011b8ed3f..2558ca7460 100644 --- a/hypha/apply/funds/templates/funds/includes/co-applicant-block.html +++ b/hypha/apply/funds/templates/funds/includes/co-applicant-block.html @@ -28,7 +28,7 @@

- {% if object.project %} + {% if object.projects.exists %}

{% trans "Project permissions are enabled and can be updated for each co-applicant." %}

diff --git a/hypha/apply/funds/templates/funds/includes/submission-list-row.html b/hypha/apply/funds/templates/funds/includes/submission-list-row.html index b2e8096ab5..13b24d9332 100644 --- a/hypha/apply/funds/templates/funds/includes/submission-list-row.html +++ b/hypha/apply/funds/templates/funds/includes/submission-list-row.html @@ -120,8 +120,8 @@ {% endif %} {% endif %} - {% if s.project %} - • {% trans "Project" %} + {% if s.projects.exists %} + • {% trans "Project" %} {% endif %}

diff --git a/hypha/apply/funds/templates/funds/includes/submission-table-row.html b/hypha/apply/funds/templates/funds/includes/submission-table-row.html index 5f6d4f3a0f..39a6c7cbd7 100644 --- a/hypha/apply/funds/templates/funds/includes/submission-table-row.html +++ b/hypha/apply/funds/templates/funds/includes/submission-table-row.html @@ -49,8 +49,8 @@ #{{ s.application_id }} submitted {{ s.submit_time|date:"SHORT_DATE_FORMAT" }} • {{ s.stage }} - {% if s.project %} - • {% trans "Project" %} + {% if s.projects.exists %} + • {% trans "Project" %} {% endif %}

diff --git a/hypha/apply/funds/tests/test_views.py b/hypha/apply/funds/tests/test_views.py index 55d77c63fe..89030aa32e 100644 --- a/hypha/apply/funds/tests/test_views.py +++ b/hypha/apply/funds/tests/test_views.py @@ -317,15 +317,13 @@ def test_can_view_submission_screening_block(self): def test_can_create_project(self): # check submission doesn't already have a Project - with self.assertRaisesMessage( - Project.DoesNotExist, "ApplicationSubmission has no project." - ): - self.submission.project # noqa: B018 + self.assertFalse(self.submission.projects.exists()) self.post_page( self.submission, { "project_create_form": "", + "title": "Bucket one", "project_lead": self.user.id, "project_initial_status": CONTRACTING, "project_end": timezone.now().date(), @@ -337,9 +335,10 @@ def test_can_create_project(self): project = Project.objects.order_by("-pk").first() submission = ApplicationSubmission.objects.get(pk=self.submission.pk) - self.assertTrue(hasattr(submission, "project")) - self.assertEqual(submission.project.id, project.id) - self.assertEqual(submission.project.status, CONTRACTING) + self.assertTrue(submission.projects.exists()) + self.assertEqual(submission.projects.first().id, project.id) + self.assertEqual(submission.projects.first().status, CONTRACTING) + self.assertEqual(project.title, "Bucket one") def test_can_see_add_determination_primary_action(self): def assert_add_determination_displayed(submission, button_text): diff --git a/hypha/apply/funds/urls.py b/hypha/apply/funds/urls.py index 8203e1b927..0edcd3b385 100644 --- a/hypha/apply/funds/urls.py +++ b/hypha/apply/funds/urls.py @@ -2,7 +2,7 @@ from django.views.generic import RedirectView from hypha.apply.projects import urls as projects_urls -from hypha.apply.projects.views import ProjectDetailView +from hypha.apply.projects.views import ProjectDetailView, SubmissionProjectsView from .views import ( RoundListView, @@ -226,7 +226,16 @@ include( [ path("", SubmissionDetailView.as_view(), name="detail"), - path("project/", ProjectDetailView.as_view(), name="project"), + path( + "project/", + SubmissionProjectsView.as_view(), + name="projects", + ), + path( + "project//", + ProjectDetailView.as_view(), + name="project", + ), path( "partial/lead/", partial_submission_lead, diff --git a/hypha/apply/projects/forms/project.py b/hypha/apply/projects/forms/project.py index 917267ac8b..9847719c47 100644 --- a/hypha/apply/projects/forms/project.py +++ b/hypha/apply/projects/forms/project.py @@ -85,10 +85,18 @@ def save(self, *args, **kwargs): class ProjectCreateForm(forms.Form): submission = forms.ModelChoiceField( - queryset=ApplicationSubmission.objects.filter(project__isnull=True), + queryset=ApplicationSubmission.objects.all(), widget=forms.HiddenInput(), ) + title = forms.CharField( + label=_("Project title"), + help_text=_( + "A submission can have several projects. Give this one a name so it " + "can be told apart from the others." + ), + ) + project_lead = forms.ModelChoiceField( label=_("Select project lead"), queryset=User.objects.all() ) @@ -109,6 +117,7 @@ def __init__(self, *args, instance=None, **kwargs): if instance: self.fields["submission"].initial = instance.id + self.fields["title"].initial = instance.title # Update lead field queryset lead_field = self.fields["project_lead"] @@ -144,6 +153,7 @@ def save(self, *args, **kwargs): status=status, end_date=end_date, start_date=start_date, + title=self.cleaned_data["title"], ) diff --git a/hypha/apply/projects/migrations/0104_alter_project_options_alter_project_submission.py b/hypha/apply/projects/migrations/0104_alter_project_options_alter_project_submission.py new file mode 100644 index 0000000000..2e9e4825a6 --- /dev/null +++ b/hypha/apply/projects/migrations/0104_alter_project_options_alter_project_submission.py @@ -0,0 +1,31 @@ +# Generated by Django 5.2.15 on 2026-06-09 07:17 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("application_projects", "0103_alter_contract_options_and_more"), + ("funds", "0135_alter_applicationsubmission_user_and_more"), + ] + + operations = [ + migrations.AlterModelOptions( + name="project", + options={ + "ordering": ("pk",), + "verbose_name": "project", + "verbose_name_plural": "projects", + }, + ), + migrations.AlterField( + model_name="project", + name="submission", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="projects", + to="funds.applicationsubmission", + ), + ), + ] diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py index bbf6075fe5..b6fa9e236d 100644 --- a/hypha/apply/projects/models/project.py +++ b/hypha/apply/projects/models/project.py @@ -235,8 +235,10 @@ class Project(BaseStreamForm, AccessFormData, models.Model): on_delete=models.SET_NULL, related_name="lead_projects", ) - submission = models.OneToOneField( - "funds.ApplicationSubmission", on_delete=models.CASCADE + submission = models.ForeignKey( + "funds.ApplicationSubmission", + on_delete=models.CASCADE, + related_name="projects", ) user = models.ForeignKey( settings.AUTH_USER_MODEL, @@ -301,6 +303,7 @@ class Project(BaseStreamForm, AccessFormData, models.Model): class Meta: verbose_name = _("project") verbose_name_plural = _("projects") + ordering = ("pk",) def __str__(self): return self.title @@ -340,13 +343,20 @@ def get_address_display(self): @classmethod def create_from_submission( - cls, submission, lead=None, status=None, end_date=None, start_date=None + cls, + submission, + lead=None, + status=None, + end_date=None, + start_date=None, + title=None, ): """ Create a Project from the given submission. - Returns a new Project or the given ApplicationSubmissions existing - Project. + A submission can have multiple projects, so callers that want + at-most-one (e.g. auto-create on determination) must guard with + submission.projects.exists() themselves. """ if not settings.PROJECTS_ENABLED: logging.error( @@ -354,12 +364,6 @@ def create_from_submission( ) return None - # OneToOne relations on the targeted model cannot be accessed without - # an exception when the relation doesn't exist (is None). Since we - # want to fail fast here, we can use hasattr instead. - if hasattr(submission, "project"): - return submission.project - # If default status is valid and status arg is None, use it otherwise fallback to draft if status is None: status = next( @@ -374,7 +378,7 @@ def create_from_submission( return Project.objects.create( submission=submission, user=submission.user, - title=submission.title, + title=title if title else submission.title, status=status, lead=lead if lead else None, proposed_end=end_date, @@ -466,7 +470,7 @@ def editable(self): return False def get_absolute_url(self): - return reverse("funds:submissions:project", args=[self.submission_id]) + return reverse("funds:submissions:project", args=[self.submission_id, self.pk]) @property def can_make_approval(self): diff --git a/hypha/apply/projects/reports/tables.py b/hypha/apply/projects/reports/tables.py index bf57070dd1..6728e9d71b 100644 --- a/hypha/apply/projects/reports/tables.py +++ b/hypha/apply/projects/reports/tables.py @@ -13,7 +13,7 @@ class ReportingTable(tables.Table): title = tables.LinkColumn( "funds:submissions:project", - args=[tables.utils.A("submission_id")], + args=[tables.utils.A("submission_id"), tables.utils.A("pk")], attrs={ "a": { "class": "link link-hover font-semibold break-words transition-colors line-clamp-2 max-w-md" diff --git a/hypha/apply/projects/reports/templates/reports/includes/reports.html b/hypha/apply/projects/reports/templates/reports/includes/reports.html index 35b1a7ddbc..84b9585e37 100644 --- a/hypha/apply/projects/reports/templates/reports/includes/reports.html +++ b/hypha/apply/projects/reports/templates/reports/includes/reports.html @@ -18,8 +18,8 @@

· {% if object.report_config.disable_reporting %} diff --git a/hypha/apply/projects/reports/views.py b/hypha/apply/projects/reports/views.py index 97238cc3db..d5957f6299 100644 --- a/hypha/apply/projects/reports/views.py +++ b/hypha/apply/projects/reports/views.py @@ -390,7 +390,7 @@ def dispatch(self, request, *args, **kwargs): Returns: HttpResponse: The response from the parent class's dispatch method. """ - self.project = get_object_or_404(Project, submission__id=kwargs.get("pk")) + self.project = get_object_or_404(Project, pk=kwargs.get("pk")) if not has_object_permission( "update_report_config", self.request.user, self.project ): diff --git a/hypha/apply/projects/tables.py b/hypha/apply/projects/tables.py index 17bfe21ce5..db966ac338 100644 --- a/hypha/apply/projects/tables.py +++ b/hypha/apply/projects/tables.py @@ -172,7 +172,7 @@ def render_project(self, record): class BaseProjectsTable(tables.Table): title = tables.LinkColumn( "funds:submissions:project", - args=[tables.utils.A("application_id")], + args=[tables.utils.A("application_id"), tables.utils.A("pk")], attrs={ "a": { "class": "link link-hover text-h4 font-semibold break-words line-clamp-2 max-w-md" @@ -254,7 +254,10 @@ class PAFForReviewDashboardTable(tables.Table): ) title = tables.LinkColumn( "funds:submissions:project", - args=[tables.utils.A("application_id")], + args=[ + tables.utils.A("project__submission__application_id"), + tables.utils.A("project__pk"), + ], orderable=False, ) status = tables.Column(verbose_name=_("Status"), accessor="pk", orderable=False) diff --git a/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html b/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html index 53575234a1..b7b9134907 100644 --- a/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html +++ b/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html @@ -23,8 +23,8 @@

{% trans "Contracting documents" %}

{% if can_submit_contract %} {% trans "Submit documents" %} @@ -34,8 +34,8 @@

{% trans "Contracting documents" %}

{% user_can_approve_contract request.user object as can_approve_contract %} {% if contract_to_approve and can_approve_contract %} {% trans "Approve" %} @@ -127,8 +127,8 @@

{% if can_upload_contract and can_initiate_contract %} {% heroicon_micro "arrow-up-tray" size=18 class="opacity-80" aria_hidden="true" %} @@ -161,8 +161,8 @@

{% if can_upload_contract and user.is_applicant %} {% heroicon_mini "arrow-up-tray" size=18 class="opacity-80" aria_hidden="true" %} @@ -182,7 +182,7 @@

  • diff --git a/hypha/apply/projects/templates/application_projects/includes/invoices.html b/hypha/apply/projects/templates/application_projects/includes/invoices.html index 840461c875..11a4a1eda8 100644 --- a/hypha/apply/projects/templates/application_projects/includes/invoices.html +++ b/hypha/apply/projects/templates/application_projects/includes/invoices.html @@ -9,7 +9,7 @@

    {% trans "Invoices" %}

    {% if can_add_invoice %}     {% trans "Add Invoice" %} diff --git a/hypha/apply/projects/templates/application_projects/includes/project_documents.html b/hypha/apply/projects/templates/application_projects/includes/project_documents.html index 6d2a11e82e..c3217fdd5d 100644 --- a/hypha/apply/projects/templates/application_projects/includes/project_documents.html +++ b/hypha/apply/projects/templates/application_projects/includes/project_documents.html @@ -21,8 +21,8 @@

    {% user_can_send_for_approval object user as can_send_to_approve %} {% if can_send_to_approve %} {% if object.paf_approvals.exists %} @@ -39,8 +39,8 @@

    {% if user == project.lead %} {% trans "Update approvers" %} @@ -48,8 +48,8 @@

    {% else %} {% trans "Change approver" %} @@ -60,8 +60,8 @@

    {% if can_assign_paf_approvers %} {% trans "Assign approver" %} @@ -71,8 +71,8 @@

    {% user_can_update_paf_status object user request=request as can_update_paf_status %} {% if object.can_make_approval and can_update_paf_status %} {% trans "Update Status" %} @@ -115,7 +115,7 @@

    {% if can_edit_pfs %} {% if object.user_has_updated_pf_details %} {% heroicon_micro "pencil-square" class="inline size-4" aria_hidden=true %} @@ -128,7 +128,7 @@

    {% if object.user_has_updated_pf_details and not user.is_applicant %} + href="{% url 'apply:projects:approval' pk=project.pk %}"> {% heroicon_micro "eye" class="inline size-4" aria_hidden=true %} {% trans "View" %} @@ -153,7 +153,7 @@

    {% if object.user_has_updated_sow_details %} {% heroicon_micro "eye" class="opacity-80 size-4" aria_hidden=true %} {% trans "View" %} @@ -163,7 +163,7 @@

    {% if can_edit_pfs %} {% if object.user_has_updated_sow_details %} {% heroicon_micro "pencil-square" class="size-4" aria_hidden=true %} @@ -182,7 +182,7 @@

    diff --git a/hypha/apply/projects/templates/application_projects/includes/project_header.html b/hypha/apply/projects/templates/application_projects/includes/project_header.html index ae6a8a20ad..761f87d36d 100644 --- a/hypha/apply/projects/templates/application_projects/includes/project_header.html +++ b/hypha/apply/projects/templates/application_projects/includes/project_header.html @@ -2,7 +2,7 @@

    @@ -28,7 +28,7 @@ {% if not HIDE_STAFF_IDENTITY or request.user.is_org_faculty %} diff --git a/hypha/apply/projects/templates/application_projects/invoice_detail.html b/hypha/apply/projects/templates/application_projects/invoice_detail.html index f790670b3b..7bdd7c687d 100644 --- a/hypha/apply/projects/templates/application_projects/invoice_detail.html +++ b/hypha/apply/projects/templates/application_projects/invoice_detail.html @@ -70,7 +70,7 @@

    {% trans "Invoice" %}

    {% trans "Invoice" %}

    {% if invoice_file_exists %}
    diff --git a/hypha/apply/projects/templates/application_projects/modals/approve_contract.html b/hypha/apply/projects/templates/application_projects/modals/approve_contract.html index 2d0474c2df..5e6e6ad099 100644 --- a/hypha/apply/projects/templates/application_projects/modals/approve_contract.html +++ b/hypha/apply/projects/templates/application_projects/modals/approve_contract.html @@ -6,6 +6,6 @@ {% trans "Are you sure you want to accept and approve the contract for commencing the project?" %} {% trans "This cannot be undone." %}

    - {% url 'apply:projects:contract_approve' pk=object.submission.id as url %} + {% url 'apply:projects:contract_approve' pk=object.pk as url %} {% include 'includes/dialog_form_base.html' with form=form value=value url=url %}
    diff --git a/hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html b/hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html index 168f8a6547..c9351a5791 100644 --- a/hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html +++ b/hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html @@ -30,7 +30,7 @@

    {% heroicon_mini "information-circle" class="inline align-middle fill-primary" aria_hidden=true %} {% trans "View template" %} @@ -51,8 +51,8 @@

    {% if document_category in remaining_contract_document_categories and can_update_documents %} @@ -65,7 +65,7 @@

    {% heroicon_outline "document" size=14 class="opacity-80 size-4" aria_hidden=true stroke_width=2 %} @@ -74,7 +74,7 @@

    {% if can_update_documents %} + +

    + {% endif %} +{% endif %} diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html index 42e1db3572..62812c90ca 100644 --- a/hypha/apply/projects/templates/application_projects/project_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_detail.html @@ -17,12 +17,7 @@ {% trans "Application" %} - - {% trans "Project" %} - + {% include "funds/includes/projects_tab.html" with submission=object.submission user=user current_project=object active=True %} Date: Tue, 9 Jun 2026 10:49:59 +0200 Subject: [PATCH 3/6] Fix links in project all table. --- hypha/apply/projects/tables.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hypha/apply/projects/tables.py b/hypha/apply/projects/tables.py index db966ac338..af4a5a7d11 100644 --- a/hypha/apply/projects/tables.py +++ b/hypha/apply/projects/tables.py @@ -172,7 +172,7 @@ def render_project(self, record): class BaseProjectsTable(tables.Table): title = tables.LinkColumn( "funds:submissions:project", - args=[tables.utils.A("application_id"), tables.utils.A("pk")], + args=[tables.utils.A("submission_id"), tables.utils.A("pk")], attrs={ "a": { "class": "link link-hover text-h4 font-semibold break-words line-clamp-2 max-w-md" @@ -255,7 +255,7 @@ class PAFForReviewDashboardTable(tables.Table): title = tables.LinkColumn( "funds:submissions:project", args=[ - tables.utils.A("project__submission__application_id"), + tables.utils.A("project__submission_id"), tables.utils.A("project__pk"), ], orderable=False, From dd098040b25c7be1b6eed4a196deb6473bbb9e47 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Mon, 29 Jun 2026 10:19:12 +0200 Subject: [PATCH 4/6] Fix issues in new report feature after rebase. Fix issue in invoices. --- hypha/apply/projects/models/payment.py | 4 +-- hypha/apply/projects/models/project.py | 4 +-- .../templates/reports/includes/reports.html | 4 +-- .../templates/reports/modals/add_report.html | 4 +-- .../projects/reports/tests/test_views.py | 8 ++--- hypha/apply/projects/reports/views.py | 29 ++++--------------- hypha/apply/projects/views/payment.py | 2 +- hypha/apply/projects/views/project.py | 2 +- 8 files changed, 18 insertions(+), 39 deletions(-) diff --git a/hypha/apply/projects/models/payment.py b/hypha/apply/projects/models/payment.py index 87f8106905..b8fd6f2898 100644 --- a/hypha/apply/projects/models/payment.py +++ b/hypha/apply/projects/models/payment.py @@ -274,7 +274,7 @@ def value(self): def get_absolute_url(self): return reverse( "apply:projects:invoice-detail", - kwargs={"pk": self.project.submission_id, "invoice_pk": self.pk}, + kwargs={"pk": self.project.pk, "invoice_pk": self.pk}, ) @property @@ -309,7 +309,7 @@ def get_absolute_url(self): return reverse( "apply:projects:invoice-supporting-document", kwargs={ - "pk": self.invoice.project.submission_id, + "pk": self.invoice.project.pk, "invoice_pk": self.invoice.pk, "file_pk": self.pk, }, diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py index b6fa9e236d..4481b48238 100644 --- a/hypha/apply/projects/models/project.py +++ b/hypha/apply/projects/models/project.py @@ -746,9 +746,7 @@ def __str__(self): ) def get_absolute_url(self): - return reverse( - "apply:projects:contract", args=[self.project.submission_id, self.pk] - ) + return reverse("apply:projects:contract", args=[self.project.pk, self.pk]) class PacketFile(models.Model): diff --git a/hypha/apply/projects/reports/templates/reports/includes/reports.html b/hypha/apply/projects/reports/templates/reports/includes/reports.html index 84b9585e37..086b53086d 100644 --- a/hypha/apply/projects/reports/templates/reports/includes/reports.html +++ b/hypha/apply/projects/reports/templates/reports/includes/reports.html @@ -31,8 +31,8 @@

    · {% trans "Add" %} diff --git a/hypha/apply/projects/reports/templates/reports/modals/add_report.html b/hypha/apply/projects/reports/templates/reports/modals/add_report.html index 216d4bcb46..f7bc325a6e 100644 --- a/hypha/apply/projects/reports/templates/reports/modals/add_report.html +++ b/hypha/apply/projects/reports/templates/reports/modals/add_report.html @@ -4,8 +4,8 @@
    {% csrf_token %} diff --git a/hypha/apply/projects/reports/tests/test_views.py b/hypha/apply/projects/reports/tests/test_views.py index daa517a2ba..ad318242c6 100644 --- a/hypha/apply/projects/reports/tests/test_views.py +++ b/hypha/apply/projects/reports/tests/test_views.py @@ -679,7 +679,7 @@ class TestReportFrequencyUpdate(BaseViewTestCase): user_factory = StaffFactory def get_kwargs(self, instance): - return {"pk": instance.submission.id} + return {"pk": instance.pk} def test_staff_can_access(self): project = ProjectFactory(status=INVOICING_AND_REPORTING) @@ -693,7 +693,7 @@ def test_applicant_cant_access(self): self.client.force_login(ApplicantFactory()) url = reverse( "funds:projects:report_frequency_update", - kwargs={"pk": project.submission.id}, + kwargs={"pk": project.pk}, ) response = self.client.get(url) assert response.status_code == 403 @@ -705,7 +705,7 @@ class TestReportDateAddView(BaseViewTestCase): user_factory = StaffFactory def get_kwargs(self, instance): - return {"pk": instance.submission.id} + return {"pk": instance.pk} def test_staff_can_get_form(self): project = ProjectFactory(status=INVOICING_AND_REPORTING) @@ -733,7 +733,7 @@ def test_duplicate_date_rejected(self): def test_applicant_cannot_access(self): project = ProjectFactory(status=INVOICING_AND_REPORTING) self.client.force_login(ApplicantFactory()) - url = reverse("funds:projects:report_add", kwargs={"pk": project.submission.id}) + url = reverse("funds:projects:report_add", kwargs={"pk": project.pk}) response = self.client.get(url) assert response.status_code == 403 diff --git a/hypha/apply/projects/reports/views.py b/hypha/apply/projects/reports/views.py index d5957f6299..f228890794 100644 --- a/hypha/apply/projects/reports/views.py +++ b/hypha/apply/projects/reports/views.py @@ -16,7 +16,6 @@ from django.core.exceptions import PermissionDenied from django.http import Http404, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render -from django.urls import reverse from django.utils.decorators import method_decorator from django.utils.translation import gettext as _ from django.views import View @@ -533,7 +532,7 @@ class ReportDateAddView(View): permission_denied_message = _("You do not have permission to add reports.") def dispatch(self, request, *args, **kwargs): - self.project = get_object_or_404(Project, submission__id=kwargs.get("pk")) + self.project = get_object_or_404(Project, pk=kwargs.get("pk")) if not has_object_permission( "update_report_config", self.request.user, self.project ): @@ -542,12 +541,7 @@ def dispatch(self, request, *args, **kwargs): def get(self, request, *args, **kwargs): if not request.htmx: - return redirect( - reverse( - "funds:submissions:project", - kwargs={"pk": self.project.submission.id}, - ) - ) + return redirect(self.project.get_absolute_url()) form = self.form_class(project=self.project) return render( request, @@ -591,12 +585,7 @@ def dispatch(self, request, *args, **kwargs): def get(self, request, *args, **kwargs): if not request.htmx: - return redirect( - reverse( - "funds:submissions:project", - kwargs={"pk": self.report.project.submission.id}, - ) - ) + return redirect(self.report.project.get_absolute_url()) form = self.form_class(instance=self.report) return render( request, self.template_name, {"form": form, "report": self.report} @@ -627,19 +616,11 @@ def dispatch(self, request, *args, **kwargs): def get(self, request, *args, **kwargs): if not request.htmx: - return redirect( - reverse( - "funds:submissions:project", - kwargs={"pk": self.report.project.submission.id}, - ) - ) + return redirect(self.report.project.get_absolute_url()) return render(request, self.template_name, {"report": self.report}) def post(self, request, *args, **kwargs): - project_url = reverse( - "funds:submissions:project", - kwargs={"pk": self.report.project.submission.id}, - ) + project_url = self.report.project.get_absolute_url() messenger( MESSAGES.DELETE_REPORT, request=request, diff --git a/hypha/apply/projects/views/payment.py b/hypha/apply/projects/views/payment.py index 8bcfd31392..0c409cd1b0 100644 --- a/hypha/apply/projects/views/payment.py +++ b/hypha/apply/projects/views/payment.py @@ -373,7 +373,7 @@ def post(self, request, *args, **kwargs): if "delete" in form.data: return redirect( "apply:projects:invoice-delete", - pk=self.object.project.submission_id, + pk=self.object.project.pk, invoice_pk=self.object.id, ) if form.is_valid(): diff --git a/hypha/apply/projects/views/project.py b/hypha/apply/projects/views/project.py index 131c1824cb..48c245095b 100644 --- a/hypha/apply/projects/views/project.py +++ b/hypha/apply/projects/views/project.py @@ -2073,7 +2073,7 @@ def get_supporting_documents(self, project): documents_dict[packet_file.title] = self.request.build_absolute_uri( reverse( "apply:projects:document", - kwargs={"pk": project.submission_id, "file_pk": packet_file.id}, + kwargs={"pk": project.pk, "file_pk": packet_file.id}, ) ) return documents_dict From cc928bc260fc15f56ce1b34256bfc9e05be98f15 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Wed, 1 Jul 2026 10:27:29 +0200 Subject: [PATCH 5/6] Implement PROJECTS_ALLOW_MULTIPLE setting, default to false. --- .../funds/includes/admin_primary_actions.html | 4 ++-- hypha/apply/funds/views/submission_edit.py | 3 +++ hypha/apply/projects/context_processors.py | 5 ++++- hypha/settings/base.py | 13 ++++++++----- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/hypha/apply/funds/templates/funds/includes/admin_primary_actions.html b/hypha/apply/funds/templates/funds/includes/admin_primary_actions.html index 0502f7b163..4ad7e42ca8 100644 --- a/hypha/apply/funds/templates/funds/includes/admin_primary_actions.html +++ b/hypha/apply/funds/templates/funds/includes/admin_primary_actions.html @@ -17,8 +17,8 @@

    {% trans "Actions to take" %}

     {% else %}
    - {% if PROJECTS_ENABLED %} - {% if object.accepted_for_funding %} + {% if PROJECTS_ENABLED and object.accepted_for_funding %} + {% if not object.projects.exists or PROJECTS_ALLOW_MULTIPLE %}