Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update public facing id of project to be the id of the submission #3944

Merged
merged 19 commits into from
Mar 11, 2025
Merged

Update public facing id of project to be the id of the submission #3944

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0761ef7
Replace project.id with project.submission.id as public_id
theskumar May 27, 2024
d20a26e
Remove the need to public id
theskumar Feb 12, 2025
b1dfcef
More updates
theskumar Feb 13, 2025
6685f1e
update more routes
theskumar Feb 14, 2025
9ca0ee4
convert more urls
theskumar Feb 14, 2025
fa3c997
Update to reporting urls
theskumar Feb 14, 2025
65a791b
Update invoice delete url
theskumar Feb 14, 2025
1247c25
update the edit title and lead dialog urls
theskumar Feb 14, 2025
30bd2b5
Update invoice edit url
theskumar Feb 20, 2025
4af7b96
Fix invoice comment link
theskumar Feb 20, 2025
d028bd2
update testcases
theskumar Feb 21, 2025
e4e6227
Few more url updates
theskumar Feb 21, 2025
a9c4338
Fix report list view
theskumar Feb 21, 2025
f55c550
update edit SOW url
theskumar Feb 24, 2025
5cc0e2e
update assign approver url
theskumar Feb 24, 2025
50e901a
Show and link to associated project in submisison list view (#4419)
theskumar Feb 27, 2025
8ccbe0a
Revert Makefile change
theskumar Mar 1, 2025
bcd4d04
lint
theskumar Mar 10, 2025
807d2e7
Show project status header if an application has been upgraded to a p…
theskumar Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update assign approver url
  • Loading branch information
@theskumar
theskumar committed Mar 10, 2025
commit 5cc0e2ef69dca082865ab2ca19941b57eaf99459
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ help: ## Show this help menu with a list of available commands and their descrip
.PHONY: serve
serve: .cache/tandem .cache/py-packages .cache/dev-build-fe ## Run Django server, docs preview, and watch frontend changes
@.cache/tandem \
'${UV_RUN}python manage.py runserver_plus --settings=$(DJANGO_SETTINGS_MODULE)' \
'${UV_RUN}python manage.py runserver 0.0.0.0:9001 --settings=$(DJANGO_SETTINGS_MODULE)' \
'npm:watch:*' \
'${UV_RUN}mkdocs serve'

Expand Down
12 changes: 6 additions & 6 deletions hypha/apply/projects/templates/application_projects/includes/project_documents.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ <h2 class="m-0 text-lg font-semibold">
{% if can_update_paf_approvers %}
{% if user == project.lead %}
<a class="button button--project-action button--project-action--white ms-2"
href="{% url 'apply:projects:update_pafapprovers' object.id %}"
hx-get="{% url 'apply:projects:update_pafapprovers' object.id %}"
href="{% url 'apply:projects:update_pafapprovers' object.submission.id %}"
hx-get="{% url 'apply:projects:update_pafapprovers' object.submission.id %}"
hx-target="#htmx-modal"
>
{% trans "View/Update Approvers" %}
</a>
{% else %}
<a class="button button--project-action button--project-action--white ms-2"
href="{% url 'apply:projects:assign_pafapprovers' object.id %}"
hx-get="{% url 'apply:projects:assign_pafapprovers' object.id %}"
href="{% url 'apply:projects:assign_pafapprovers' object.submission.id %}"
hx-get="{% url 'apply:projects:assign_pafapprovers' object.submission.id %}"
hx-target="#htmx-modal"
>
{% trans "Change approver" %}
Expand All @@ -46,8 +46,8 @@ <h2 class="m-0 text-lg font-semibold">
{% endif %}
{% if can_assign_paf_approvers %}
<a class="button button--project-action"
href="{% url 'apply:projects:assign_pafapprovers' object.id %}"
hx-get="{% url 'apply:projects:assign_pafapprovers' object.id %}"
href="{% url 'apply:projects:assign_pafapprovers' object.submission.id %}"
hx-get="{% url 'apply:projects:assign_pafapprovers' object.submission.id %}"
hx-target="#htmx-modal"
>
{% trans "Assign approver" %}
Expand Down
8 changes: 4 additions & 4 deletions hypha/apply/projects/templates/application_projects/project_approval_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ <h5>{% trans "Actions to take" %}</h5>
{% if can_update_paf_approvers %}
{% if user != project.lead %}
<a class="button button--bottom-space button--white button--full-width"
href="{% url 'apply:projects:assign_pafapprovers' object.id %}"
hx-get="{% url 'apply:projects:assign_pafapprovers' object.id %}"
href="{% url 'apply:projects:assign_pafapprovers' pk=object.submission.id %}"
hx-get="{% url 'apply:projects:assign_pafapprovers' pk=object.submission.id %}"
hx-target="#htmx-modal"
>
{% trans "Change approver" %}
Expand All @@ -124,8 +124,8 @@ <h5>{% trans "Actions to take" %}</h5>
{% user_can_assign_approvers_to_project object user request as can_assign_paf_approvers %}
{% if can_assign_paf_approvers %}
<a class="button button--bottom-space button--primary button--full-width"
href="{% url 'apply:projects:assign_pafapprovers' object.id %}"
hx-get="{% url 'apply:projects:assign_pafapprovers' object.id %}"
href="{% url 'apply:projects:assign_pafapprovers' pk=object.submission.id %}"
hx-get="{% url 'apply:projects:assign_pafapprovers' pk=object.submission.id %}"
hx-target="#htmx-modal"
>
{% trans "Assign approver" %}
Expand Down