From f979cbd51f769379d4f99058fab7fbfe7890386a Mon Sep 17 00:00:00 2001
From: Daksh Bhayana
Date: Thu, 8 May 2025 00:32:19 +0530
Subject: [PATCH 1/2] FMT fix
---
warehouse/locale/messages.pot | 22 +++++++++++--------
.../manage/organization/projects.html | 15 ++++++++++---
2 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/warehouse/locale/messages.pot b/warehouse/locale/messages.pot
index db3cf69c5b51..9da2538d9c3b 100644
--- a/warehouse/locale/messages.pot
+++ b/warehouse/locale/messages.pot
@@ -1541,8 +1541,8 @@ msgstr ""
#: warehouse/templates/manage/account/totp-provision.html:69
#: warehouse/templates/manage/account/webauthn-provision.html:44
#: warehouse/templates/manage/organization/activate_subscription.html:34
-#: warehouse/templates/manage/organization/projects.html:128
-#: warehouse/templates/manage/organization/projects.html:151
+#: warehouse/templates/manage/organization/projects.html:129
+#: warehouse/templates/manage/organization/projects.html:160
#: warehouse/templates/manage/organization/roles.html:270
#: warehouse/templates/manage/organization/roles.html:291
#: warehouse/templates/manage/organization/settings.html:50
@@ -5617,15 +5617,15 @@ msgid ""
"project to the organization."
msgstr ""
-#: warehouse/templates/manage/organization/projects.html:127
+#: warehouse/templates/manage/organization/projects.html:128
msgid "️Name of existing project"
msgstr ""
-#: warehouse/templates/manage/organization/projects.html:134
+#: warehouse/templates/manage/organization/projects.html:135
msgid "You do not own any projects that you can add to this organization."
msgstr ""
-#: warehouse/templates/manage/organization/projects.html:141
+#: warehouse/templates/manage/organization/projects.html:142
msgid ""
"Owners or managers of this organization can transfer a project that they "
"own to this organization if the project has not been added to another "
@@ -5633,21 +5633,25 @@ msgid ""
"be transferred from the project settings page."
msgstr ""
-#: warehouse/templates/manage/organization/projects.html:146
+#: warehouse/templates/manage/organization/projects.html:147
msgid "Transfer existing project"
msgstr ""
-#: warehouse/templates/manage/organization/projects.html:150
+#: warehouse/templates/manage/organization/projects.html:151
+msgid "The Organization does not have any active subscription."
+msgstr ""
+
+#: warehouse/templates/manage/organization/projects.html:159
msgid "️Name of new project"
msgstr ""
-#: warehouse/templates/manage/organization/projects.html:161
+#: warehouse/templates/manage/organization/projects.html:170
msgid ""
"Owners of this organization can create an empty project and add it to the"
" organization."
msgstr ""
-#: warehouse/templates/manage/organization/projects.html:166
+#: warehouse/templates/manage/organization/projects.html:175
msgid "Create and add new project"
msgstr ""
diff --git a/warehouse/templates/manage/organization/projects.html b/warehouse/templates/manage/organization/projects.html
index 06d531b4763a..2f063fb0f548 100644
--- a/warehouse/templates/manage/organization/projects.html
+++ b/warehouse/templates/manage/organization/projects.html
@@ -111,9 +111,9 @@
{% trans %}Add project to organization{% endtrans %}
{% trans %}️New or existing project?{% endtrans %}
{% for subfield in add_organization_project_form.add_existing_project %}
- {{ subfield(data_target=".radio-toggle-" + loop.index|string) }}
- {{ subfield.label }}
- {% endfor %}
+ {%set is_existing = subfield.data == 'true' %} {% set should_disable =
+ is_existing and not organization.active_subscription %} {{ subfield(data_target=".radio-toggle-" + loop.index|string,
+ disabled=should_disable) }} {{ subfield.label }} {% endfor %}