Adjust Product & Version display on TestRun page

use the relationship TR->Build as the starting point because TR->Plan is much more likely to update its Product/Version values in the future. NOTE: the field `product_version` which is removed from tests doesn't make sense because neither the underlying forms, not the underlying models have such a field.
kiwitcms · Dec 3, 2023 · 61ef60d · 61ef60d
1 parent d70dc11
commit 61ef60d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/tcms/templates/email/post_run_save/email.txt b/tcms/templates/email/post_run_save/email.txt
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% blocktrans with pk=test_run.pk run_url=test_run.get_full_url plan_url=test_run.plan.get_full_url summary=test_run.summary manager=test_run.manager default_tester=test_run.default_tester product=test_run.plan.product version=test_run.plan.product_version build=test_run.build notes=test_run.notes %}Test run {{ pk }} has been created or updated for you.
+{% blocktrans with pk=test_run.pk run_url=test_run.get_full_url plan_url=test_run.plan.get_full_url summary=test_run.summary manager=test_run.manager default_tester=test_run.default_tester product=test_run.build.version.product version=test_run.build.version build=test_run.build notes=test_run.notes %}Test run {{ pk }} has been created or updated for you.
 
 ### Links ###
 Test run: {{ run_url }}

diff --git a/tcms/testruns/templates/testruns/get.html b/tcms/testruns/templates/testruns/get.html
@@ -42,17 +42,17 @@ <h2 class="card-pf-title" style="text-align: left">
 
                 <h2 class="card-pf-title" style="text-align: left">
                     <span class="fa fa-shopping-cart"></span>{% trans 'Product' %}:
-                    <a href="{% url 'testruns-search' %}?product={{ object.plan.product_id }}" title="Search test runs of {{ object.plan.product }}">{{ object.plan.product }}</a>
+                    <a href="{% url 'testruns-search' %}?product={{ object.build.version.product_id }}" title="Search test runs of {{ object.build.version.product }}">{{ object.build.version.product }}</a>
                 </h2>
 
                 <h2 class="card-pf-title" style="text-align: left">
                     <span class="fa fa-random"></span>{% trans 'Version' %}:
-                    <a href="{% url 'testruns-search' %}?product={{ object.plan.product_id }}&version={{ object.plan.product_version_id }}" title="Search test runs of {{ object.plan.product_version.value }}">{{ object.plan.product_version.value }}</a>
+                    <a href="{% url 'testruns-search' %}?product={{ object.build.version.product_id }}&version={{ object.build.version_id }}" title="Search test runs of {{ object.build.version.value }}">{{ object.build.version.value }}</a>
                 </h2>
 
                 <h2 class="card-pf-title" style="text-align: left">
                     <span class="fa fa-wrench"></span>{% trans 'Build' %}:
-                    <a href="{% url 'testruns-search' %}?product={{ object.plan.product_id }}&version={{ object.plan.product_version_id }}&build={{ object.build_id }}" title="Search test runs of {{ object.build }}">{{ object.build }}</a>
+                    <a href="{% url 'testruns-search' %}?product={{ object.build.version.product_id }}&version={{ object.build.version_id }}&build={{ object.build_id }}" title="Search test runs of {{ object.build }}">{{ object.build }}</a>
                 </h2>
 
                 <h2 class="card-pf-title" style="text-align: left">
@@ -295,7 +295,7 @@ <h2 class="card-pf-title">
                                     </button>
 
                                     <button class="btn btn-default"
-                                        href="{% url 'testcases-search' %}?product={{ object.plan.product_id }}{% for status in confirmed_statuses %}&case_status={{ status.pk }}{% endfor %}"
+                                        href="{% url 'testcases-search' %}?product={{ object.build.version.product_id }}{% for status in confirmed_statuses %}&case_status={{ status.pk }}{% endfor %}"
                                         id="btn-search-cases" title="{% trans 'Advanced search' %}">
                                         <span class="fa fa-search"></span>
                                     </button>

diff --git a/tcms/testruns/tests/test_permissions.py b/tcms/testruns/tests/test_permissions.py
@@ -30,7 +30,6 @@ def setUpTestData(cls):
             "manager": cls.test_run.manager.email,
             "default_tester": intern.email,
             "notes": "New run notes",
-            "product_version": cls.test_run.plan.product_version.pk,
             "plan": cls.test_run.plan.pk,
         }
         super().setUpTestData()

diff --git a/tcms/testruns/tests/test_views.py b/tcms/testruns/tests/test_views.py
@@ -114,8 +114,8 @@ def test_post_creates_new_run(self):
         post_data = {
             "summary": new_run_summary,
             "plan": self.plan.pk,
-            "product_id": self.plan.product_id,
-            "product": self.plan.product_id,
+            "product_id": self.build.version.product_id,
+            "product": self.build.version.product_id,
             "build": self.build.pk,
             "manager": self.tester.email,
             "default_tester": self.tester.email,