Patchwork [bitbake-devel,01/18] toaster: Revert "added file types to the Outputs column in the build page"

login
register
mail settings
Submitter Alexandru DAMIAN
Date March 24, 2014, 6:37 p.m.
Message ID <7e59b6b1cb44de00c512facece5ede96375a411f.1395686148.git.alexandru.damian@intel.com>
Download mbox | patch
Permalink /patch/69087/
State New
Headers show

Comments

Alexandru DAMIAN - March 24, 2014, 6:37 p.m.
From: Alexandru DAMIAN <alexandru.damian@intel.com>

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.

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
---
 lib/toaster/toastergui/templates/build.html        |  6 +----
 lib/toaster/toastergui/templatetags/projecttags.py | 27 ----------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

Patch

diff --git a/lib/toaster/toastergui/templates/build.html b/lib/toaster/toastergui/templates/build.html
index 1c94e7c..8f557e9 100644
--- a/lib/toaster/toastergui/templates/build.html
+++ b/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/lib/toaster/toastergui/templatetags/projecttags.py b/lib/toaster/toastergui/templatetags/projecttags.py
index e08258b..e7b23cb 100644
--- a/lib/toaster/toastergui/templatetags/projecttags.py
+++ b/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()
 
@@ -191,31 +189,6 @@  def string_slice(strvar,slicevar):
         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,
        else return package.size