Commit 373a426c authored by Jelle van der Waa's avatar Jelle van der Waa 🚧
Browse files

Update differences view for dropping i686

Remove the i686 and x86_64 comparison since i686 is dropped and change
the multilib difference to compare against x86_64 instead of i686.
parent 0b02234f
......@@ -210,8 +210,8 @@ def multilib_differences():
ORDER BY ml.last_update
"""
multilib = Repo.objects.get(name__iexact='multilib')
i686 = Arch.objects.get(name='i686')
params = ['lib32-%', '%-multilib', multilib.id, False, False, i686.id]
x86_64 = Arch.objects.get(name='x86_64')
params = ['lib32-%', '%-multilib', multilib.id, False, False, x86_64.id]
cursor = connection.cursor()
cursor.execute(sql, params)
......
......@@ -106,16 +106,8 @@ def update(request):
def arch_differences(request):
# TODO: we have some hardcoded magic here with respect to the arches.
arch_a = Arch.objects.get(name='i686')
arch_b = Arch.objects.get(name='x86_64')
differences = get_differences_info(arch_a, arch_b)
multilib_diffs = multilib_differences()
context = {
'arch_a': arch_a,
'arch_b': arch_b,
'differences': differences,
'multilib_differences': multilib_diffs
'multilib_differences': multilib_differences()
}
return render(request, 'packages/differences.html', context)
......
......@@ -7,56 +7,6 @@
{% block navbarclass %}anb-packages{% endblock %}
{% block content %}
<div class="box">
<h2>Package Differences by Architecture</h2>
<div class="filter-criteria">
<h3>Filter Differences View</h3>
<form id="diff_filter" method="post" action=".">
<fieldset>
<legend>Select filter criteria</legend>
<div><label for="id_archonly" title="Limit packages to selected architecture">Architecture Limitation</label>
<select name="archonly" id="id_archonly">
<option value="all">Show All</option>
<option value="both" selected="selected">Only In Both</option>
<option value="{{ arch_a.name }}">In {{ arch_a.name }} Only</option>
<option value="{{ arch_b.name }}">In {{ arch_b.name }} Only</option>
</select>
</div>
<div><label for="id_multilib" title="Show multilib packages"><tt>[multilib]</tt> Visible</label>
<input type="checkbox" name="multilib" id="id_multilib" value="multilib"/></div>
<div><label for="id_minor" title="Show minor version mismatches">Minor Version Mismatches</label>
<input type="checkbox" name="minor" id="id_minor" value="minor"/></div>
<div ><label>&nbsp;</label><input title="Reset search criteria" type="button" id="criteria_reset" value="Reset"/></div>
</fieldset>
</form>
</div>
<table id="table_differences" class="results">
<thead>
<tr>
<th>Package Name</th>
<th>Repository</th>
<th>{{ arch_a.name }} Version</th>
<th>{{ arch_b.name }} Version</th>
</tr>
</thead>
<tbody id="tbody_differences">
{% for diff in differences %}
<tr class="{% cycle 'odd' 'even' %} {{ diff.classes }}">
<td>{{ diff.pkgname }}</td>
<td>{{ diff.repo.name }}</td>
{% if diff.pkg_a %}
<td>{% pkg_details_link diff.pkg_a diff.pkg_a.full_version True %}</td>
{% else %}<td>-</td>{% endif %}
{% if diff.pkg_b %}
<td>{% pkg_details_link diff.pkg_b diff.pkg_b.full_version True %}</td>
{% else %}<td>-</td>{% endif %}
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="box">
<h2>Multilib Differences to Main Packages</h2>
......@@ -65,11 +15,11 @@ <h2>Multilib Differences to Main Packages</h2>
<tr>
<th>Multilib Name</th>
<th>Multilib Version</th>
<th>i686 Version</th>
<th>i686 Name</th>
<th>i686 Repo</th>
<th>x86_64 Version</th>
<th>x86_64 Name</th>
<th>x864_ Repo</th>
<th>Multilib Last Updated</th>
<th>i686 Last Updated</th>
<th>x86_64 Last Updated</th>
</tr>
</thead>
<tbody>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment