rrs: handle maintenance plans in views

Insert maintenance plan into views, their corresponding URLs and
templates.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

4 files changed, 19 insertions, 19 deletions

diff --git a/templates/rrs/base_toplevel.html b/templates/rrs/base_toplevel.html
index 9df5b3b5bd..ee6790864c 100644
--- a/templates/rrs/base_toplevel.html
+++ b/templates/rrs/base_toplevel.html
@@ -22,7 +22,7 @@
         </a>
         <ul class="dropdown-menu">
             {% for r in all_releases %}
-                <li><a href="{% url this_url_name r.name "All" %}{{ extra_url_param }}">
+                <li><a href="{% url this_url_name maintplan_name r.name "All" %}{{ extra_url_param }}">
                     {% if r.name = release_name %}<b>{% endif %}
                     {{ r.name }}
                     {% if r.name = release_name %}</b>{% endif %}
@@ -39,7 +39,7 @@
         </a>
         <ul class="dropdown-menu">
             {% for m in all_milestones %}
-                <li><a href="{% url this_url_name release_name m.name %}{{ extra_url_param }}">
+                <li><a href="{% url this_url_name maintplan_name release_name m.name %}{{ extra_url_param }}">
                     {% if m.name = milestone_name %}<b>{% endif %}
                     {{ m.name }}
                     {% if m.name = milestone_name %}</b>{% endif %}
@@ -49,7 +49,7 @@
     </li>
 {% endblock %}
 </ul>
-                    <a href="{% url 'rrs_recipesreport' release_name milestone_name %}" class="btn pull-right">Export recipe list</a>
+                    <a href="{% url 'rrs_recipesreport' maintplan_name release_name milestone_name %}" class="btn pull-right">Export recipe list</a>
 {% endblock %}
 
 {% block content %}
@@ -98,7 +98,7 @@
                 <a href="#">
 		{% else %}
                 <li>
-                <a href="{% url 'rrs_recipes' release_name milestone_name %}{{ extra_url_param }}">
+                <a href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}{{ extra_url_param }}">
 		{% endif %}
                 Recipes upstream status</a>
                 </li>
@@ -108,7 +108,7 @@
                 <a href="#">
 		{% else %}
                 <li>
-                <a href="{% url 'rrs_maintainers' release_name milestone_name %}">
+                <a href="{% url 'rrs_maintainers' maintplan_name release_name milestone_name %}">
 		{% endif %}
                 Maintainer statistics</a>
                 </li>
diff --git a/templates/rrs/maintainers.html b/templates/rrs/maintainers.html
index 78ba9e0342..54bc34051f 100644
--- a/templates/rrs/maintainers.html
+++ b/templates/rrs/maintainers.html
@@ -64,27 +64,27 @@
             {{ ml.name }}
         </td>
         <td>
-            <a class="rowData" href="{% url 'rrs_recipes' release_name milestone_name %}?maintainer_name={{ ml.name|urlencode }}">
+            <a class="rowData" href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}?maintainer_name={{ ml.name|urlencode }}">
                 {{ ml.recipes_all }}
             </a>
         </td>
         <td>
-            <a class="rowData" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Up-to-date"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
+            <a class="rowData" href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}?upstream_status={{ "Up-to-date"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
                 {{ ml.recipes_up_to_date }}
             </a>
         </td>
         <td>
-            <a class="rowData" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Not updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
+            <a class="rowData" href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}?upstream_status={{ "Not updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
                 {{ ml.recipes_not_updated }}
             </a>
         </td>
         <td>
-            <a class="rowData" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Can't be updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
+            <a class="rowData" href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}?upstream_status={{ "Can't be updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
                 {{ ml.recipes_cant_be_updated }}
             </a>
         </td>
         <td>
-            <a class="rowData" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Unknown"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
+            <a class="rowData" href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}?upstream_status={{ "Unknown"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
                 {{ ml.recipes_unknown }}
             </a>
         </td>
@@ -105,23 +105,23 @@
    <tr class="totalRow">
         <td id="totalCell">Total</td>
         <td>
-            <a id="totalAssigned" class="totalCol" href="{% url 'rrs_recipes' release_name milestone_name %}">
+            <a id="totalAssigned" class="totalCol" href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}">
             </a>
        </td>
         <td> 
-            <a id="totalUptoDate" class="totalCol" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Up-to-date"|urlencode }}">
+            <a id="totalUptoDate" class="totalCol" href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}?upstream_status={{ "Up-to-date"|urlencode }}">
             </a>
         </td>
         <td>
-            <a class="totalCol"  href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Not updated"|urlencode }}">
+            <a class="totalCol"  href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}?upstream_status={{ "Not updated"|urlencode }}">
             </a>
         </td>
         <td>
-            <a class="totalCol" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Can't be updated"|urlencode }}">
+            <a class="totalCol" href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}?upstream_status={{ "Can't be updated"|urlencode }}">
             </a>
         </td>
         <td> 
-            <a class="totalCol" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Unknown"|urlencode }}">
+            <a class="totalCol" href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}?upstream_status={{ "Unknown"|urlencode }}">
             </a>
         </td>
         <td id="totalPercentage"></td>
diff --git a/templates/rrs/recipedetail.html b/templates/rrs/recipedetail.html
index d326816576..4f67700ec0 100644
--- a/templates/rrs/recipedetail.html
+++ b/templates/rrs/recipedetail.html
@@ -44,7 +44,7 @@
             <li class="lead">Upstream version: <span>{{ upstream_version }}</span></li>
             {% endif %}
             <li class="divider-vertical"></li>
-            <li class="lead">Maintainer: <span><a href="{% url 'rrs_recipes' 'release_name' 'milestone_name' %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></span></li>
+            <li class="lead">Maintainer: <span><a href="{% url 'rrs_recipes' maintplan_name release_name milestone_name %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></span></li>
             <li class="divider-vertical"></li>
         </ul>
     </div>
@@ -79,7 +79,7 @@
                     <td>{{ rud.version }}</td>
                     {% if rud.milestone_name %}
                     <td>
-                        <a href="{% url 'rrs_recipes' rud.release_name rud.milestone_name %}">
+                        <a href="{% url 'rrs_recipes' rud.maintplan_name rud.release_name rud.milestone_name %}">
                             {{ rud.release_name }}
                             {% if rud.milestone_name != "All" %}
                             {{ rud.milestone_name }}
@@ -97,7 +97,7 @@
                     <td>{{ rud.date }}</td>
 
                     {% if rud.is_recipe_maintainer %} 
-                    <td><a href="{% url 'rrs_recipes' rud.release_name rud.milestone_name %}?maintainer_name={{ rud.maintainer_name|urlencode }}">{{ rud.maintainer_name }}</a></td>
+                    <td><a href="{% url 'rrs_recipes' rud.maintplan_name rud.release_name rud.milestone_name %}?maintainer_name={{ rud.maintainer_name|urlencode }}">{{ rud.maintainer_name }}</a></td>
                     {% else %}
                     <td>{{ rud.maintainer_name }}</a></td>
                     {% endif %}
diff --git a/templates/rrs/recipes.html b/templates/rrs/recipes.html
index 89b4c6fb61..63dcb51abc 100644
--- a/templates/rrs/recipes.html
+++ b/templates/rrs/recipes.html
@@ -83,7 +83,7 @@
 <tbody>
 {% for r in recipe_list %}
 <tr>
-    <td class="recipe_column"><a href="{% url "rrs_recipedetail" r.pk %}">{{ r.name }}</a></td>
+    <td class="recipe_column"><a href="{% url "rrs_recipedetail" maintplan_name r.pk %}">{{ r.name }}</a></td>
     <td class="version_column">{{ r.version }}</td>
     <td class="upstream_version_column">{{ r.upstream_version }}</td>
     {% if r.upstream_status == "Up-to-date" %}