users: hide access for temp unavailable partners

WikipediaLibrary · Oct 6, 2022 · 086ae6f · 086ae6f
1 parent 709aa83
commit 086ae6f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/TWLight/users/templates/users/user_collection_tile.html b/TWLight/users/templates/users/user_collection_tile.html
@@ -113,6 +113,7 @@
             {% if user_collection.auth_latest_sent_app %}
               {% if not user_collection.auth_has_expired %}
                 <div class="col-xl-6 col-lg-12" style="padding: 0px;">
+                {% if not user_collection.partner_phabricator_disabled %}
                   <a href="{{ user_collection.partner_access_url }}" class="btn btn-sm twl-btn access-apply-button"
                         type="button" name="button" target="_blank" rel="noopener"
                         style="font-size: 14px;">
@@ -124,6 +125,7 @@
                         {% trans "Access collection" %}
                     {% endif %}
                   </a>
+                {% endif %}
                 </div>
               {% endif %}
               <div class="col-xl-6 col-lg-12" style="padding: 0px;">
@@ -142,7 +144,7 @@
             {% endif %}
           </div>
         {% endif %}
-      {% else %}
+      {% elif not user_collection.partner_phabricator_disabled %}
         <div class="col-12" style="padding: 0px;">
           <a href="{{ user_collection.partner_access_url }}" class="btn btn-sm twl-btn access-apply-button"
                   type="button" name="button" target="_blank" rel="noopener">

diff --git a/TWLight/users/views.py b/TWLight/users/views.py
@@ -85,9 +85,12 @@ def _is_real_url(url):
         return False
 
 
-def _build_phab_task_list(phab_task_qs):
+def _build_task_state(phab_task_qs):
     task_list = []
+    disabled = False
     for task in phab_task_qs:
+        if task.task_type == 2:
+            disabled = True
         task_list.append(
             {
                 "id": str(task.phabricator_task),
@@ -97,7 +100,7 @@ def _build_phab_task_list(phab_task_qs):
                 "url": str(task.url),
             }
         )
-    return task_list
+    return task_list, disabled
 
 
 def _redirect_to_next_param(request):
@@ -996,9 +999,10 @@ def _build_authorization_object(
                         partner_short_description_key,
                         partner_description_key,
                     )
-                    partner_phabricator_tasks = _build_phab_task_list(
-                        user_authorization_partner.phab_task_qs
-                    )
+                    (
+                        partner_phabricator_tasks,
+                        partner_phabricator_disabled,
+                    ) = _build_task_state(user_authorization_partner.phab_task_qs)
 
                     try:
                         partner_logo = user_authorization_partner.logos.logo.url
@@ -1025,6 +1029,7 @@ def _build_authorization_object(
                         ],
                         "partner_description": partner_descriptions["description"],
                         "partner_phabricator_tasks": partner_phabricator_tasks,
+                        "partner_phabricator_disabled": partner_phabricator_disabled,
                         "partner_languages": user_authorization_partner.get_languages,
                         "partner_tags": translated_tags,
                         "partner_authorization_method": user_authorization_partner.authorization_method,
@@ -1145,7 +1150,7 @@ def _build_available_collection_object(
             except PartnerLogo.DoesNotExist:
                 partner_logo = None
 
-            partner_phabricator_tasks = _build_phab_task_list(
+            partner_phabricator_tasks, partner_phabricator_disabled = _build_task_state(
                 available_collection.phab_task_qs
             )
 
@@ -1161,6 +1166,7 @@ def _build_available_collection_object(
                     "short_description": partner_descriptions["short_description"],
                     "description": partner_descriptions["description"],
                     "partner_phabricator_tasks": partner_phabricator_tasks,
+                    "partner_phabricator_disabled": partner_phabricator_disabled,
                     "languages": available_collection.get_languages,
                     "tags": translated_tags,
                     "is_not_available": available_collection.is_not_available,