Merge branch 'develop' into fix/frontpage_predict

epdb/urls.py

@@ -142,11 +142,6 @@ urlpatterns = [
         v.package_pathway,
         name="package pathway detail",
     ),
-    re_path(
-        rf"^package/(?P<package_uuid>{UUID})/predict$",
-        v.package_predict_pathway,
-        name="package predict pathway",
-    ),
     # Pathway Nodes
     re_path(
         rf"^package/(?P<package_uuid>{UUID})/pathway/(?P<pathway_uuid>{UUID})/node$",

epdb/views.py

@@ -374,22 +374,6 @@ def predict_pathway(request):
     return render(request, "predict_pathway.html", context)
 
 
-@package_permission_required()
-def package_predict_pathway(request, package_uuid):
-    """Package-specific predict pathway view."""
-    if request.method != "GET":
-        return HttpResponseNotAllowed(["GET"])
-
-    current_user = _anonymous_or_real(request)
-    current_package = PackageManager.get_package_by_id(current_user, package_uuid)
-
-    context = get_base_context(request)
-    context["title"] = f"enviPath - {current_package.name} - Predict Pathway"
-    context["meta"]["current_package"] = current_package
-
-    return render(request, "predict_pathway.html", context)
-
-
 def packages(request):
     current_user = _anonymous_or_real(request)
 

templates/actions/collections/pathway.html

@@ -1,9 +1,6 @@
 {% if meta.can_edit %}
     <li>
-    <a
-      href="{% if meta.current_package %}{{ meta.current_package.url }}/predict{% else %}{{ meta.server_url }}/predict{% endif %}"
-    >
-      <span class="glyphicon glyphicon-plus"></span> New Pathway</a
-    >
+        <a href="{{ meta.server_url }}/predict">
+            <span class="glyphicon glyphicon-plus"></span> New Pathway</a>
     </li>
 {% endif %}

templates/predict_pathway.html

@@ -2,13 +2,7 @@
 {% load static %}
 {% block content %}
   <div class="mx-auto w-full p-8">
-    <h1 class="h1 mb-4 text-3xl font-bold">
-      Predict a Pathway
-
-      <span class="text-base-content/50 text-xs"
-        >in <strong>{{ meta.current_package.name|safe }}</strong>
-      </span>
-    </h1>
+    <h1 class="h1 mb-4 text-3xl font-bold">Predict a Pathway</h1>
 
     <form
       id="predict_form"