From 604d2c8df30b0139704991703b99ae9039c0f342 Mon Sep 17 00:00:00 2001
From: Alexandru DAMIAN <alexandru.damian@intel.com>
Date: Thu, 20 Mar 2014 11:44:19 +0000
Subject: bitbake: toaster: Revert "added file types to the Outputs column in
 the build page"

This reverts commit d40ac966b22e1fa1956d8f2fe37fd55fa670e88f.

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>
---
 .../lib/toaster/toastergui/templates/build.html    |  6 +----
 .../toaster/toastergui/templatetags/projecttags.py | 27 ----------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

(limited to 'bitbake/lib/toaster')

diff --git a/bitbake/lib/toaster/toastergui/templates/build.html b/bitbake/lib/toaster/toastergui/templates/build.html
index 1c94e7c8f9..8f557e9686 100644
--- a/bitbake/lib/toaster/toastergui/templates/build.html
+++ b/bitbake/lib/toaster/toastergui/templates/build.html
@@ -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 %}
diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
index e08258b6e7..e7b23cbff2 100644
--- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
+++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
@@ -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,
-- 
cgit v1.2.3-54-g00ecf