MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename RRS URLs to have rrs_ prefix

Browse Source 
Make these distinct from the layerindex ones.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2018-02-27 09:52:29 +13:00
parent bb20ca4fb0
commit e50c2e6841
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rrs/urls.py
View File

@ -6,20 +6,20 @@ from rrs.views import RecipeListView, recipes_report, RecipeDetailView, \
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^$', FrontPageRedirect.as_view(), url(r'^$', FrontPageRedirect.as_view(),
name='frontpage'), name='rrs_frontpage'),
url(r'^recipes/(?P<release_name>.*)/(?P<milestone_name>.*)/$', url(r'^recipes/(?P<release_name>.*)/(?P<milestone_name>.*)/$',
RecipeListView.as_view( RecipeListView.as_view(
template_name='rrs/recipes.html'), template_name='rrs/recipes.html'),
name='recipes'), name='rrs_recipes'),
url(r'^recipesreport/(?P<release_name>.*)/(?P<milestone_name>.*)/$', url(r'^recipesreport/(?P<release_name>.*)/(?P<milestone_name>.*)/$',
recipes_report, recipes_report,
name="recipesreport"), name="rrs_recipesreport"),
url(r'^recipedetail/(?P<pk>\d+)/$', url(r'^recipedetail/(?P<pk>\d+)/$',
RecipeDetailView.as_view( RecipeDetailView.as_view(
template_name='rrs/recipedetail.html'), template_name='rrs/recipedetail.html'),
name='recipedetail'), name='rrs_recipedetail'),
url(r'^maintainers/(?P<release_name>.*)/(?P<milestone_name>.*)/$', url(r'^maintainers/(?P<release_name>.*)/(?P<milestone_name>.*)/$',
MaintainerListView.as_view( MaintainerListView.as_view(
template_name='rrs/maintainers.html'), template_name='rrs/maintainers.html'),
name="maintainers"), name="rrs_maintainers"),
) )

2
rrs/views.py
View File

@ -23,7 +23,7 @@ class FrontPageRedirect(RedirectView):
def get_redirect_url(self): def get_redirect_url(self):
release_name = Release.get_current().name release_name = Release.get_current().name
milestone_name = Milestone.get_current(Release.get_current()).name milestone_name = Milestone.get_current(Release.get_current()).name
return reverse('recipes', args=(release_name, milestone_name)) return reverse('rrs_recipes', args=(release_name, milestone_name))
def _check_url_params(upstream_status, maintainer_name): def _check_url_params(upstream_status, maintainer_name):
get_object_or_404(Maintainer, name=maintainer_name) get_object_or_404(Maintainer, name=maintainer_name)

10
templates/rrs/base_toplevel.html
View File

@ -49,7 +49,7 @@
</li> </li>
{% endblock %} {% endblock %}
</ul> </ul>
<a href="{% url 'recipesreport' release_name milestone_name %}" class="btn pull-right">Export recipe list</a> <a href="{% url 'rrs_recipesreport' release_name milestone_name %}" class="btn pull-right">Export recipe list</a>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
@ -93,22 +93,22 @@
{% block content_top %} {% block content_top %}
<ul class="nav nav-pills"> <ul class="nav nav-pills">
{% if this_url_name == 'recipes' %} {% if this_url_name == 'rrs_recipes' %}
<li class="active"> <li class="active">
<a href="#"> <a href="#">
{% else %} {% else %}
<li> <li>
<a href="{% url 'recipes' release_name milestone_name %}{{ extra_url_param }}"> <a href="{% url 'rrs_recipes' release_name milestone_name %}{{ extra_url_param }}">
{% endif %} {% endif %}
Recipes upstream status</a> Recipes upstream status</a>
</li> </li>
{% if this_url_name == 'maintainers' %} {% if this_url_name == 'rrs_maintainers' %}
<li class="active"> <li class="active">
<a href="#"> <a href="#">
{% else %} {% else %}
<li> <li>
<a href="{% url 'maintainers' release_name milestone_name %}"> <a href="{% url 'rrs_maintainers' release_name milestone_name %}">
{% endif %} {% endif %}
Maintainer statistics</a> Maintainer statistics</a>
</li> </li>

20
templates/rrs/maintainers.html
View File

@ -64,27 +64,27 @@
{{ ml.name }} {{ ml.name }}
</td> </td>
<td> <td>
<a class="rowData" href="{% url 'recipes' release_name milestone_name %}?maintainer_name={{ ml.name|urlencode }}"> <a class="rowData" href="{% url 'rrs_recipes' release_name milestone_name %}?maintainer_name={{ ml.name|urlencode }}">
{{ ml.recipes_all }} {{ ml.recipes_all }}
</a> </a>
</td> </td>
<td> <td>
<a class="rowData" href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Up-to-date"|urlencode }}&maintainer_name={{ ml.name|urlencode }}"> <a class="rowData" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Up-to-date"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
{{ ml.recipes_up_to_date }} {{ ml.recipes_up_to_date }}
</a> </a>
</td> </td>
<td> <td>
<a class="rowData" href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Not updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}"> <a class="rowData" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Not updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
{{ ml.recipes_not_updated }} {{ ml.recipes_not_updated }}
</a> </a>
</td> </td>
<td> <td>
<a class="rowData" href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Can't be updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}"> <a class="rowData" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Can't be updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
{{ ml.recipes_cant_be_updated }} {{ ml.recipes_cant_be_updated }}
</a> </a>
</td> </td>
<td> <td>
<a class="rowData" href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Unknown"|urlencode }}&maintainer_name={{ ml.name|urlencode }}"> <a class="rowData" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Unknown"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
{{ ml.recipes_unknown }} {{ ml.recipes_unknown }}
</a> </a>
</td> </td>
@ -105,23 +105,23 @@
<tr class="totalRow"> <tr class="totalRow">
<td id="totalCell">Total</td> <td id="totalCell">Total</td>
<td> <td>
<a id="totalAssigned" class="totalCol" href="{% url 'recipes' release_name milestone_name %}"> <a id="totalAssigned" class="totalCol" href="{% url 'rrs_recipes' release_name milestone_name %}">
</a> </a>
</td> </td>
<td> <td>
<a id="totalUptoDate" class="totalCol" href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Up-to-date"|urlencode }}"> <a id="totalUptoDate" class="totalCol" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Up-to-date"|urlencode }}">
</a> </a>
</td> </td>
<td> <td>
<a class="totalCol" href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Not updated"|urlencode }}"> <a class="totalCol" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Not updated"|urlencode }}">
</a> </a>
</td> </td>
<td> <td>
<a class="totalCol" href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Can't be updated"|urlencode }}"> <a class="totalCol" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Can't be updated"|urlencode }}">
</a> </a>
</td> </td>
<td> <td>
<a class="totalCol" href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Unknown"|urlencode }}"> <a class="totalCol" href="{% url 'rrs_recipes' release_name milestone_name %}?upstream_status={{ "Unknown"|urlencode }}">
</a> </a>
</td> </td>
<td id="totalPercentage"></td> <td id="totalPercentage"></td>

6
templates/rrs/recipedetail.html
View File

@ -44,7 +44,7 @@
<li class="lead">Upstream version: <span>{{ upstream_version }}</span></li> <li class="lead">Upstream version: <span>{{ upstream_version }}</span></li>
{% endif %} {% endif %}
<li class="divider-vertical"></li> <li class="divider-vertical"></li>
<li class="lead">Maintainer: <span><a href="{% url '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' 'release_name' 'milestone_name' %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></span></li>
<li class="divider-vertical"></li> <li class="divider-vertical"></li>
</ul> </ul>
</div> </div>
@ -79,7 +79,7 @@
<td>{{ rud.version }}</td> <td>{{ rud.version }}</td>
{% if rud.milestone_name %} {% if rud.milestone_name %}
<td> <td>
<a href="{% url 'recipes' rud.release_name rud.milestone_name %}"> <a href="{% url 'rrs_recipes' rud.release_name rud.milestone_name %}">
{{ rud.release_name }} {{ rud.release_name }}
{% if rud.milestone_name != "All" %} {% if rud.milestone_name != "All" %}
{{ rud.milestone_name }} {{ rud.milestone_name }}
@ -97,7 +97,7 @@
<td>{{ rud.date }}</td> <td>{{ rud.date }}</td>
{% if rud.is_recipe_maintainer %} {% if rud.is_recipe_maintainer %}
<td><a href="{% url '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.release_name rud.milestone_name %}?maintainer_name={{ rud.maintainer_name|urlencode }}">{{ rud.maintainer_name }}</a></td>
{% else %} {% else %}
<td>{{ rud.maintainer_name }}</a></td> <td>{{ rud.maintainer_name }}</a></td>
{% endif %} {% endif %}

2
templates/rrs/recipes.html
View File

@ -83,7 +83,7 @@
<tbody> <tbody>
{% for r in recipe_list %} {% for r in recipe_list %}
<tr> <tr>
<td class="recipe_column"><a href="{% url "recipedetail" r.pk %}">{{ r.name }}</a></td> <td class="recipe_column"><a href="{% url "rrs_recipedetail" r.pk %}">{{ r.name }}</a></td>
<td class="version_column">{{ r.version }}</td> <td class="version_column">{{ r.version }}</td>
<td class="upstream_version_column">{{ r.upstream_version }}</td> <td class="upstream_version_column">{{ r.upstream_version }}</td>
{% if r.upstream_status == "Up-to-date" %} {% if r.upstream_status == "Up-to-date" %}