bitbake: toaster: Revert "added file types to the Outputs column in the build page"
This reverts commit d40ac966b2
.
Sloppy review on my part let the original patch in, when it should've
been rejected because the filter tags should have no knowledge of the
object system.
(Bitbake rev: 7e59b6b1cb44de00c512facece5ede96375a411f)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
888ceb1252
commit
604d2c8df3
|
@ -92,11 +92,7 @@
|
|||
<td class="warnings_no">{% if build.warnings_no %}<a class="warnings_no warning" href="{% url "builddashboard" build.id %}#warnings">{{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a>{%endif%}</td>
|
||||
<td class="time"><a href="{% url "buildtime" build.id %}">{{build.timespent|sectohms}}</a></td>
|
||||
<td class="log">{{build.cooker_log_path}}</td>
|
||||
<td class="output">
|
||||
{% if build.outcome == 0 %}
|
||||
{{build|get_image_extensions}}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="output">{% if build.outcome == 0 %}{% for t in build.target_set.all %}{% if t.is_image %}<a href="{%url "builddashboard" build.id%}#images">TODO: compute image output fstypes</a>{% endif %}{% endfor %}{% endif %}</td>
|
||||
</tr>
|
||||
|
||||
{% endfor %}
|
||||
|
|
|
@ -24,8 +24,6 @@ import re
|
|||
from django import template
|
||||
from django.utils import timezone
|
||||
from django.template.defaultfilters import filesizeformat
|
||||
from orm.models import Target_Installed_Package, Target_Image_File
|
||||
from orm.models import Build, Target, Task, Layer, Layer_Version
|
||||
|
||||
register = template.Library()
|
||||
|
||||
|
@ -190,31 +188,6 @@ def string_slice(strvar,slicevar):
|
|||
else:
|
||||
return strvar[int(first):int(last)]
|
||||
|
||||
@register.filter
|
||||
def get_image_extensions( build ):
|
||||
"""
|
||||
This is a simple filter that returns a list (string)
|
||||
of extensions of the build-targets-image files. Note
|
||||
that each build can have multiple targets and each
|
||||
target can yield more than one image file
|
||||
"""
|
||||
targets = Target.objects.filter( build_id = build.id );
|
||||
comma = "";
|
||||
extensions = "";
|
||||
for t in targets:
|
||||
if ( not t.is_image ):
|
||||
continue;
|
||||
tif = Target_Image_File.objects.filter( target_id = t.id );
|
||||
for i in tif:
|
||||
try:
|
||||
ndx = i.file_name.index( "." );
|
||||
except ValueError:
|
||||
ndx = 0;
|
||||
s = i.file_name[ ndx + 1 : ];
|
||||
extensions += comma + s;
|
||||
comma = ", ";
|
||||
return( extensions );
|
||||
|
||||
@register.filter
|
||||
def filtered_installedsize(size, installed_size):
|
||||
"""If package.installed_size not null and not empty return it,
|
||||
|
|
Loading…
Reference in New Issue