Don't use get_full_url where not needed. Closes #380

kiwitcms · Aug 17, 2018 · eda96d1 · eda96d1
1 parent 3b8ec42
commit eda96d1
Show file tree

Hide file tree

Showing 25 changed files with 66 additions and 61 deletions.
diff --git a/tcms/static/js/testcase_actions.js b/tcms/static/js/testcase_actions.js
@@ -156,6 +156,7 @@ Nitrate.TestCases.List.on_load = function() {
       {"sClass": "expandable"}
     ]
   });
+
   jQ("#testcases_table tbody tr td.expandable").live("click", function() {
     var tr = jQ(this).parent();
     var caseRowContainer = tr;
@@ -773,7 +774,6 @@ function constructPlanCaseZone(container, case_id, parameters) {
         "bAutoWidth": false,
         "aaSorting": [[ 0, "desc" ]],
         "aoColumns": [
-          {"sType": "num-html"},
           null,
           {"sType": "html"},
           {"sType": "html"},

diff --git a/tcms/static/js/testplan_actions.js b/tcms/static/js/testplan_actions.js
@@ -212,7 +212,7 @@ Nitrate.TestPlans.TreeView = {
       }
 
       var li = jQ('<li>');
-      var title = '[<a href="' + data[i].get_full_url + '">' + data[i].pk + '</a>] ';
+      var title = '[<a href="' + data[i].plan_url + '">' + data[i].pk + '</a>] ';
 
       if (data[i].num_children && data[i].children) {
         title = icon_expand + title;
@@ -235,20 +235,20 @@ Nitrate.TestPlans.TreeView = {
       }
 
       // Construct the items
-      title += '<a class="plan_name" href="' + data[i].get_full_url + '">' + data[i].name + '</a>';
+      title += '<a class="plan_name" href="' + data[i].plan_url + '">' + data[i].name + '</a>';
       title += ' (';
       if (data[i].num_cases && data[i].is_current) {
         title += '<a href="#testcases" onclick="FocusTabOnPlanPage(this)">' + data[i].num_cases + ' cases</a>, ';
       } else if (data[i].num_cases && !(data[i].is_current)) {
-        title += '<a href="' + data[i].get_full_url + '#testcases">' + data[i].num_cases + ' cases</a>, ';
+        title += '<a href="' + data[i].plan_url + '#testcases">' + data[i].num_cases + ' cases</a>, ';
       } else {
         title += '0 case, ';
       }
 
       if (data[i].num_runs && data[i].is_current) {
         title += '<a href="#testruns" onclick="FocusTabOnPlanPage(this)">' + data[i].num_runs + ' runs</a>, ';
       } else if (data[i].num_runs && !data[i].is_current) {
-        title += '<a href="' + data[i].get_full_url + '#testruns">' + data[i].num_runs + ' runs</a>, ';
+        title += '<a href="' + data[i].plan_url + '#testruns">' + data[i].num_runs + ' runs</a>, ';
       } else {
         title += '0 runs, ';
       }
@@ -271,10 +271,10 @@ Nitrate.TestPlans.TreeView = {
             title += '0 child';
             break;
           case 1:
-            title += '<a href="' + data[i].get_full_url + '#treeview">' + '1 child</a>';
+            title += '<a href="' + data[i].plan_url + '#treeview">' + '1 child</a>';
             break;
           default:
-            title += '<a href="' + data[i].get_full_url + '#treeview">' + data[i].num_children + ' children</a>';
+            title += '<a href="' + data[i].plan_url + '#treeview">' + data[i].num_children + ' children</a>';
             break;
         }
 

diff --git a/tcms/templates/case/clone_select_plan.html b/tcms/templates/case/clone_select_plan.html
@@ -3,21 +3,19 @@
 {{ testplan.name }}
 <table class="list border-1" cellpadding="0" cellspacing="0">
 <tr>
-	<th width="3%">&nbsp;</th>
-    <th class="widthID">ID</th>
+    <th width="3%">&nbsp;</th>
+    <th class="widthID">Plan Summary</th>
     <th width="8%">Plan Type</th>
     <th width="8%">Author</th>
     <th width="8%">Is Active</th>
-    <th>Plan Summary</th>
 </tr>
 {% for test_plan in test_plans %}
 <tr class="{% cycle 'odd' 'even' %}">
-	<td align="center"><input type="checkbox" name="plan" value="{{ test_plan.plan_id }}" /></td>
-    <td><a href="{{ test_plan.get_full_url }}" target="_blank">{{ test_plan.plan_id }}</a></td>
+    <td align="center"><input type="checkbox" name="plan" value="{{ test_plan.plan_id }}" /></td>
+    <td><a href="{% url 'test_plan_url' test_plan.pk test_plan.name|slugify %}" target="_blank">TP-{{ test_plan.pk }} - {{ test_plan }}</a></td>
     <td>{{ test_plan.type }}</td>
     <td>{{ test_plan.author }}</td>
     <td>{% if test_plan.is_active %} Yes {% else %} No {% endif %}</td>
-    <td><a href="{{ test_plan.get_full_url }}" target="_blank">{{ test_plan }}</a></td>
 </tr>
 {% empty %}
 <tr><td>&nbsp;</td><td colspan="5">There are no plans</td></tr>

diff --git a/tcms/templates/case/get.html b/tcms/templates/case/get.html
@@ -60,7 +60,7 @@
                 {% endif %}
 		{% if test_plan %}
 		<span class="right-action">
-			<a href="{{ test_plan.get_full_url }}">Back to Test Plan</a>
+			<a href="{% url 'test_plan_url' test_plan.pk test_plan.name|slugify %}">Back to Test Plan</a>
 		</span>
 		{% endif %}
 	</div>

diff --git a/tcms/templates/case/get_case_run.html b/tcms/templates/case/get_case_run.html
@@ -7,7 +7,7 @@
 		<td class="plan_expandable listGroupBlue" colspan="12">
 		<img class="blind_icon collapse" src="{% static 'images/t1.gif' %}" border="0" alt="">
 		<input type="hidden" name="case" value="{{ test_case.pk }}" />
-		Plan:<span style="padding:0 0 0 6px;"><a href="{{ plan.get_full_url }}">[{{ plan.pk }}] {{ plan.name }}</a></span>
+		Plan:<span style="padding:0 0 0 6px;"><a href="{% url 'test_plan_url' plan.pk plan.name|slugify %}">TP-{{ plan.pk }}: {{ plan.name }}</a></span>
 		</td>
 	</tr>
 	<tr class="case_run_list hide" style="display:none;">

diff --git a/tcms/templates/case/get_plan.html b/tcms/templates/case/get_plan.html
@@ -1,8 +1,7 @@
 <table id='testplans_table' count='{{ test_plans.count }}' class="list" cellpadding="0" cellspacing="0" width="100%">
     <thead>
         <tr>
-            <th class="widthID">ID</th>
-            <th >Name</th>
+            <th>Name</th>
             <th width="150">Author</th>
             <th width="100">Type</th>
             <th width="200">Product</th>
@@ -13,8 +12,7 @@
     <tbody>
         {% for test_plan in test_plans %}
         <tr class="{% cycle 'even' 'odd' %}">
-            <td><a href="{{ test_plan.get_full_url }}">{{ test_plan.plan_id }}</a></td>
-            <td><a href="{{ test_plan.get_full_url }}">{{ test_plan.name }}</a></td>
+            <td><a href="{% url 'test_plan_url' test_plan.pk test_plan.name|slugify %}">TP-{{ test_plan.pk }}: {{ test_plan.name }}</a></td>
             <td><a href="{% url "tcms-profile" test_plan.author.username %}">{{ test_plan.author.username }}</a></td>
             <td>{{ test_plan.type }}</td>
             <td>{{ test_plan.product }}</td>
@@ -36,7 +34,7 @@
 	{% if perms.testcases.add_testcaseplan %}
 	<tfoot>
         <tr>
-            <td colspan="7" style="padding:0;">
+            <td colspan="6" style="padding:0;">
                 <form id="id_plan_form" method="get">
                     <div class="addtag">
                         <span class="tit">Add into another Plan</span>

diff --git a/tcms/templates/case/new.html b/tcms/templates/case/new.html
@@ -154,7 +154,7 @@ <h4>Expected Results</h4>
 				{% if test_plan %}
 				<input type="submit" name="_addanother" value="Save and add another" />
 				<input type="submit" name="_returntoplan" value="Save and return to plan" />
-				<input type="button" value="Cancel" class="js-plan-cancel" data-param="{{ test_plan.get_full_url }}" />
+				<input type="button" value="Cancel" class="js-plan-cancel" data-param="{% url 'test_plan_url' test_plan.pk test_plan.name|slugify %}" />
 				{% else %}
 				<input type="button" value="cancel" class="js-case-cancel" >
 				{% endif %}

diff --git a/tcms/templates/dashboard.html b/tcms/templates/dashboard.html
@@ -62,7 +62,7 @@
 				{% for test_plan in last_15_test_plans %}
                 {% if test_plan.is_active %}
 				<tr class="{% cycle 'odd' 'even' %}">
-					<td height="27"><a class="link" href="{{ test_plan.get_full_url }}">{{ test_plan.name }}</a></td>
+					<td height="27"><a class="link" href="{% url 'test_plan_url' test_plan.pk test_plan.name|slugify %}">{{ test_plan.name }}</a></td>
 					<td>{{ test_plan.product }}</td>
 					<td>{{ test_plan.type }}</td>
 					<td><a href="/runs/?plan={{ test_plan.plan_id }}">{{ test_plan.num_runs }}</a></td>

diff --git a/tcms/templates/plan/choose_testrun.html b/tcms/templates/plan/choose_testrun.html
@@ -1,7 +1,7 @@
 {% extends "tcms_base.html" %}
 {% load static %}
 
-{% block subtitle %}Choose test run to assign case{% endblock %}
+{% block subtitle %}Add TestCase(s) to TestRun(s){% endblock %}
 
 {% block custom_stylesheet %}
 {% endblock %}
@@ -17,7 +17,7 @@
 
 {% block contents %}
 <div id="content">
-	<h2 id="display_title"><a href="{{ plan.get_full_url }}">Plan:{{ plan.name }}</a></h2>
+	<h2 id="display_title">TestPlan: {{ plan.name }}</h2>
 	<form action="" method="post">
 		<table id="id_table_runs" class="list" cellpadding="0" cellspacing="0" border="0" >
 			<thead>

diff --git a/tcms/templates/plan/common/json_plans.txt b/tcms/templates/plan/common/json_plans.txt
@@ -7,8 +7,8 @@
     {
         "DT_RowId": "plan_{{test_plan.pk}}",
         "DT_RowClass": {% if not test_plan.is_active %}"line-through inactive"{%else%}""{% endif %},
-        "0":"<a href='{{ test_plan.get_full_url }}'>{{ test_plan.plan_id }}</a>",
-        "1":"<a href='{{ test_plan.get_full_url }}' title='Go to {{ test_plan.name|escapejs|escape }}'>{{ test_plan|escapejs|escape }} </a>",
+        "0":"<a href='{% url "test_plan_url" test_plan.pk test_plan.name|slugify %}'>{{ test_plan.plan_id }}</a>",
+        "1":"<a href='{% url "test_plan_url" test_plan.pk test_plan.name|slugify %}' title='Go to {{ test_plan.name|escapejs|escape }}'>{{ test_plan|escapejs|escape }} </a>",
         "2":"<a href='{% url "tcms-profile" test_plan.author.username %}'>{{ test_plan.author }}</a>",
         {% if test_plan.owner %}
             "3":"<a href='{% url "tcms-profile" test_plan.owner.username %}'>{{ test_plan.owner }}</a>"
@@ -18,8 +18,8 @@
         "4":"{{ test_plan.product }}",
         "5":"{{ test_plan.product_version }}",
         "6":"{{ test_plan.type }}",
-        "7":"<a href='{{ test_plan.get_full_url }}' title='{{ test_plan.cal_cases_count }} test cases'>{{ test_plan.cal_cases_count }}</a>",
-        "8":"<a href='{{ test_plan.get_full_url }}#testruns' title='{{ test_plan.cal_runs_count }} test runs'>{{ test_plan.cal_runs_count }}</a>",
+        "7":"<a href='{% url "test_plan_url" test_plan.pk test_plan.name|slugify %}#testcases' title='{{ test_plan.cal_cases_count }} test cases'>{{ test_plan.cal_cases_count }}</a>",
+        "8":"<a href='{% url "test_plan_url" test_plan.pk test_plan.name|slugify %}#testruns' title='{{ test_plan.cal_runs_count }} test runs'>{{ test_plan.cal_runs_count }}</a>",
         {% if perms.testplans.change_testplan %}
             "9":"<a class='editlink' href='{% url "plan-edit" test_plan.plan_id %}'>Edit</a>"
         {% else %}

diff --git a/tcms/templates/plan/common/plans_advance_filtered.html b/tcms/templates/plan/common/plans_advance_filtered.html
@@ -17,8 +17,8 @@
 		<tbody>
 			{% for test_plan in test_plans %}
 			<tr class="{% if not test_plan.is_active %}line-through inactive{% endif %}">
-				<td class="{% if not test_plan.is_active %}underline{% endif %}"><a href="{{ test_plan.get_full_url }}">{{ test_plan.plan_id }}</a></td>
-				<td class="{% if not test_plan.is_active %}underline{% endif %}"><a href="{{ test_plan.get_full_url }}" title="Go to {{ test_plan.name }}">{{ test_plan }} </a></td>
+				<td class="{% if not test_plan.is_active %}underline{% endif %}"><a href="{% url 'test_plan_url' test_plan.pk test_plan.name|slugify %}">{{ test_plan.plan_id }}</a></td>
+				<td class="{% if not test_plan.is_active %}underline{% endif %}"><a href="{% url 'test_plan_url' test_plan.pk test_plan.name|slugify %}" title="Go to {{ test_plan.name }}">{{ test_plan }} </a></td>
 				<td><a href="{% url "tcms-profile" test_plan.author.username %}">{{ test_plan.author }}</a></td>
 				<td>
 					{% if test_plan.owner %}
@@ -30,8 +30,8 @@
 				<td class="col_product_content">{{ test_plan.product }}</td>
 				<td style="display:none" class="col_product_version_content">{{ test_plan.product_version }}</td>
 				<td>{{ test_plan.type }}</td>
-				<td><a href="{{ test_plan.get_full_url }}" title="{{ test_plan.num_cases }} test cases">{{ test_plan.num_cases }}</a></td>
-				<td><a href="{{ test_plan.get_full_url }}#testruns" title="{{ test_plan.num_runs }} test runs">{{ test_plan.num_runs }}</a></td>
+				<td><a href="{% url 'test_plan_url' test_plan.pk test_plan.name|slugify %}#testcases" title="{{ test_plan.num_cases }} test cases">{{ test_plan.num_cases }}</a></td>
+				<td><a href="{% url 'test_plan_url' test_plan.pk test_plan.name|slugify %}#testruns" title="{{ test_plan.num_runs }} test runs">{{ test_plan.num_runs }}</a></td>
 				<td>
 					{% if perms.testplans.change_testplan %}
 					<a class="editlink" href="{% url "plan-edit" test_plan.plan_id %}">Edit</a>

diff --git a/tcms/templates/plan/get.html b/tcms/templates/plan/get.html
@@ -121,7 +121,7 @@ <h2 id="display_title" class="{% ifequal test_plan.is_active 0 %}line-through{%
 				<div class="title grey">Parent&nbsp;:</div>
 				<div class="name ">
 				{% if test_plan.parent.pk %}
-					<a href="{{ test_plan.parent.get_full_url }}">{{ test_plan.parent.pk }}</a>
+					<a href="{% url 'test_plan_url_short' test_plan.parent.pk %}">{{ test_plan.parent.pk }}</a>
 				{% else %}
 					None
 				{% endif %}

diff --git a/tcms/templates/report/custom_details_case_runs.html b/tcms/templates/report/custom_details_case_runs.html
@@ -11,7 +11,7 @@
 	</tr>
 	{% for test_case_run, bugs, comments in case_runs %}
 	<tr>
-		<td valign="top"><a href="{{ test_case_run.case.get_full_url }}">{{ test_case_run.case.pk }}</a></td>
+		<td valign="top"><a href="{% url 'testcases-get' test_case_run.case_id %}">{{ test_case_run.case.pk }}</a></td>
 		<td valign="top"><a href="{% url 'testruns-get' test_case_run.run_id %}#caserun_{{ test_case_run.pk }}">{{ test_case_run.pk }}</a></td>
 		<td valign="top">{{ test_case_run.case.summary }}</td>
 		<td valign="top">{{ test_case_run.case.category }}</td>

diff --git a/tcms/templates/report/custom_details_status_matrix.html b/tcms/templates/report/custom_details_status_matrix.html
@@ -20,10 +20,10 @@
 		<tr>
 			{% ifnotequal plan None %}
 			<td class="group_by" valign="middle" rowspan="{{ plan.1 }}" data-plan-id="{{ plan.0.plan_id }}">
-			  <a href="{{ plan.0.get_full_url }}">[{{ plan.0.plan_id }}] {{ plan.0.name }}</a>
+			  <a href="{% url 'test_plan_url' plan.0.pk plan.0.name|slugify %}">TP-{{ plan.0.pk }}: {{ plan.0.name }}</a>
 			</td>
 			{% endifnotequal %}
-			<td valign="top"><a href="{{ run.get_full_url }}">[{{ run.run_id }}] {{ run.summary }}</a></td>
+			<td valign="top"><a href="{% url 'testruns-get' run.pk %}">TR-{{ run.pk }}: {{ run.summary }}</a></td>
 			<td valign="top">{{ status_count.IDLE|default:'' }}</td>
 			<td valign="top">{{ status_count.RUNNING|default:'' }}</td>
 			<td valign="top">{{ status_count.PAUSED|default:'' }}</td>

diff --git a/tcms/templates/report/testing-report/by_plan_build_with_rates.html b/tcms/templates/report/testing-report/by_plan_build_with_rates.html
@@ -38,7 +38,7 @@
 		</tr>
 		{% for plan, builds_count, runs_count, status_subtotal in report_data.reports %}
 		<tr>
-			<td><a href="{{ plan.get_full_url }}">{{ plan.name }}</a></td>
+			<td><a href="{% url 'test_plan_url' plan.pk plan.name|slugify %}">{{ plan.name }}</a></td>
 			<td>{{ builds_count }}</td>
 			<td>{{ runs_count }}</td>
 			<td>{{ status_subtotal.PASSED|default:0 }}</td>

diff --git a/tcms/templates/report/testing-report/per_plan_build.html b/tcms/templates/report/testing-report/per_plan_build.html
@@ -25,7 +25,7 @@
 
 	{% for plan, builds_count, runs_count, caseruns_count, status_matrix in report_data.reports %}
 	<div class="reportSummary01">
-		<ul><li class="tagTab">Plan: <a href="{{ plan.get_full_url }}">{{ plan }}</a></li></ul>
+		<ul><li class="tagTab">Plan: <a href="{% url 'test_plan_url' plan.pk plan.name|slugify %}">{{ plan }}</a></li></ul>
 		<ul>
 			<li>Builds:<span>{{ builds_count }}</span></li>
 			<li>Runs:<span>{{ runs_count }}</span></li>
@@ -55,7 +55,7 @@
 				{% ifnotequal build.1 None %}
 				<td rowspan="{{ build.1 }}" class="bgRowspan"><span>{{ build.0 }}</span></td>
 				{% endifnotequal %}
-				<td><a href="{{ run.get_full_url }}">{{ run.summary }}</a></td>
+				<td><a href="{% url 'testruns-get' run.pk %}">{{ run.summary }}</a></td>
 				<td><a href="{{ report_url }}{{path_without_build}}&r_build={{build.0.pk}}&run={{ run.pk }}&status=idle">{{ status_subtotal.IDLE|default:0 }}</a></td>
 				<td><a href="{{ report_url }}{{path_without_build}}&r_build={{build.0.pk}}&run={{ run.pk }}&status=running">{{ status_subtotal.RUNNING|default:0 }}</a></td>
 				<td><a href="{{ report_url }}{{path_without_build}}&r_build={{build.0.pk}}&run={{ run.pk }}&status=paused">{{ status_subtotal.PAUSED|default:0 }}</a></td>

diff --git a/tcms/templates/report/testing-report/per_plan_tag.html b/tcms/templates/report/testing-report/per_plan_tag.html
@@ -54,10 +54,10 @@
 			{% endifnotequal %}
 			{% ifnotequal plan.1 None %}
 			<td {% ifnotequal plan.1 1 %}rowspan="{{ plan.1 }}"{% endifnotequal %} class="bgRowspan">
-				<a href="{{ plan.0.get_full_url }}">[{{ plan.0.pk }}] {{ plan.0.name }}</a>
+				<a href="{% url 'test_plan_url' plan.0.pk plan.0.name|slugify %}">TP-{{ plan.0.pk }}: {{ plan.0.name }}</a>
 			</td>
 			{% endifnotequal %}
-			<td><a href="{{ run.get_full_url }}">{{ run.summary }}</a></td>
+			<td><a href="{% url 'testruns-get' run.pk %}">{{ run.summary }}</a></td>
 			<td><a href="{{ report_url }}{{path_without_build}}&r_build={{ build.0.pk }}&plan_tag={{ tag_name }}&run={{ run.pk }}&status=idle">{{ status_subtotal.IDLE|default:0 }}</a></td>
 			<td><a href="{{ report_url }}{{path_without_build}}&r_build={{ build.0.pk }}&plan_tag={{ tag_name }}&run={{ run.pk }}&status=running">{{ status_subtotal.RUNNING|default:0 }}</a></td>
 			<td><a href="{{ report_url }}{{path_without_build}}&r_build={{ build.0.pk }}&plan_tag={{ tag_name }}&run={{ run.pk }}&status=paused">{{ status_subtotal.PAUSED|default:0 }}</a></td>

diff --git a/tcms/templates/run/assign_case.html b/tcms/templates/run/assign_case.html
@@ -29,7 +29,7 @@ <h2 id="display_title">Add TestCase(s) to <a href="{% url "testruns-get" test_ru
 		</tr>
 		<tr class="cell">
 			<td class="lab">Test Plan</td>
-			<td><a href="{{ test_run.plan.get_full_url }}">{{ test_run.plan.name }}</a></td>
+			<td><a href="{% url 'test_plan_url' test_run.plan.pk test_run.plan.name|slugify %}">{{ test_run.plan.name }}</a></td>
 			<td class="lab">All Confirmed Cases</td>
 			<td><a>{{ confirmed_cases_count }}</a></td>
 		</tr>

diff --git a/tcms/templates/run/common/run_advance_filtered.html b/tcms/templates/run/common/run_advance_filtered.html
@@ -21,7 +21,7 @@
 			<td><a href="{% url "testruns-get" test_run.run_id %}" >{{ test_run.summary }}</a></td>
 			<td><a href="{% url "tcms-profile" test_run.manager.username %}">{{ test_run.manager }}</a></td>
 			<td>{% if test_run.default_tester_id %}<a href="{% url "tcms-profile" test_run.default_tester.username %}">{% endif %}{{ test_run.default_tester }}{% if test_run.default_tester_id %}</a>{% endif %}</td>
-			<td style="display:none" class="col_plan_content"><a href="{{ test_run.plan.get_full_url }}" >{{ test_run.plan }}</a></td>
+			<td style="display:none" class="col_plan_content"><a href="{% url 'test_plan_url' test_run.plan.pk test_run.plan.name|slugify %}" >{{ test_run.plan }}</a></td>
 			<td>{{ test_run.build.product }}</td>
 			<td>{{ test_run.product_version }}</td>
 			<td>{{ test_run.env_values_str }}</td>

diff --git a/tcms/templates/run/edit.html b/tcms/templates/run/edit.html
@@ -113,7 +113,7 @@ <h2>Edit Test Run</h2>
 							<p>
 								Environment group must be set for this test plan (<b>{{ test_run.plan.product }}</b>:
 								<b>{{ test_run.product_version }}</b>:
-								<b><a href="{{ test_run.plan.get_full_url }}">{{ test_run.plan }}</a></b>
+								<b><a href="{% url 'test_plan_url' test_run.plan.pk test_run.plan.name|slugify %}">{{ test_run.plan }}</a></b>
 								) before you will be able to select environments for this test run.If you do not have permission to edit this plan,
 								please contact the author of this plan
                                                             <a href="{% url "tcms-profile" test_run.plan.author.username %}">{{ test_run.plan.author.username }}</a>

diff --git a/tcms/templates/run/get.html b/tcms/templates/run/get.html
@@ -59,7 +59,7 @@ <h2 id="display_title">{{ test_run.summary }}</h2>
 			<div class="listinfo">
 				<div class="title grey">Test Plan&nbsp;:</div>
 				<div class="name">
-					<a href="{{ test_run.plan.get_full_url }}">[{{ test_run.plan.pk }}] {{ test_run.plan.name }}</a>
+					<a href="{% url 'test_plan_url' test_run.plan.pk test_run.plan.name|slugify %}">[{{ test_run.plan.pk }}] {{ test_run.plan.name }}</a>
 				</div>
 			</div>
 			<div class="listinfo">

diff --git a/tcms/templates/run/new.html b/tcms/templates/run/new.html
@@ -103,7 +103,8 @@ <h2>Create New Test Run</h2>
 						{% empty%}
 						<div class="system_help">
 							<p>
-								Environment group must be set for this test plan (<b>{{ test_plan.product.name }}</b>:<b>{{ test_plan.product_version.value }}</b>:<b><a href="{{ test_plan.get_full_url }}">{{ test_plan }}</a></b>) before you will be able to select environments for this test run.If you do not have permission to edit this plan, please contact the author of this plan
+								Environment group must be set for this test plan (<b>{{ test_plan.product.name }}</b>:<b>{{ test_plan.product_version.value }}</b>:<b>
+                                                                <a href="{% url 'test_plan_url' test_plan.pk test_plan.name|slugify %}">{{ test_plan }}</a></b>) before you will be able to select environments for this test run.If you do not have permission to edit this plan, please contact the author of this plan
                                                             <a href="{% url "tcms-profile" test_plan.author.username %}">{{ test_plan.author.username }}</a>
 							</p>
 						</div>