From 3c4f3775f73e9a85949d5ad59f15e2df790020fa Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Fri, 8 May 2015 17:33:21 +0100 Subject: bitbake: toastergui: removing unused views We remove url entries, views and templates that are not used in the interface; these are leftovers from the development process, and are not linked anywhere in the interface nor mentioned in documentation. (Bitbake rev: 96bdebaa1aa43a35dc0747eda3081e7cf1a3dbde) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- .../lib/toaster/toastergui/templates/layer.html | 34 -------------------- .../lib/toaster/toastergui/templates/package.html | 36 ---------------------- bitbake/lib/toaster/toastergui/urls.py | 5 --- bitbake/lib/toaster/toastergui/views.py | 29 ----------------- 4 files changed, 104 deletions(-) delete mode 100644 bitbake/lib/toaster/toastergui/templates/layer.html delete mode 100644 bitbake/lib/toaster/toastergui/templates/package.html diff --git a/bitbake/lib/toaster/toastergui/templates/layer.html b/bitbake/lib/toaster/toastergui/templates/layer.html deleted file mode 100644 index 410d766c60..0000000000 --- a/bitbake/lib/toaster/toastergui/templates/layer.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "basetable.html" %} - -{% block pagename %} -

Toaster - Layers

-{% endblock %} - -{% block pagetable %} - {% load projecttags %} - - - Name - Local Path - Layer Index URL - Known Versions - - - {% for layer in objects %} - - - {{layer.name}} - {{layer.local_path}} - {{layer.layer_index_url}} - - {% for lv in layer.versions %} - - {% endfor %} -
- ({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes) -
- - - {% endfor %} - -{% endblock %} diff --git a/bitbake/lib/toaster/toastergui/templates/package.html b/bitbake/lib/toaster/toastergui/templates/package.html deleted file mode 100644 index 1ba372608d..0000000000 --- a/bitbake/lib/toaster/toastergui/templates/package.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "basebuildpage.html" %} - -{% block pagetable %} - {% if not objects %} -

No packages were recorded for this target!

- {% else %} - - - Name - Version - Size (Bytes) - Recipe - Depends on - - - {% for package in objects %} - - - {{package.name}} - {{package.version}} - {{package.size}} - {%if package.recipe %} - {{package.recipe.name}}{{package.package_name}}{%endif%} - -
- {% for d in package.package_dependencies_source.all %} - {{d.depends_on.name}}
- {% endfor %} -
- - - {% endfor %} - - {% endif %} - -{% endblock %} diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py index 52fc0cc0ed..de8c62cd62 100644 --- a/bitbake/lib/toaster/toastergui/urls.py +++ b/bitbake/lib/toaster/toastergui/urls.py @@ -56,7 +56,6 @@ urlpatterns = patterns('toastergui.views', url(r'^dentries/build/(?P\d+)/target/(?P\d+)$', 'dirinfo_ajax', name='dirinfo_ajax'), url(r'^build/(?P\d+)/target/(?P\d+)/dirinfo$', 'dirinfo', name='dirinfo'), url(r'^build/(?P\d+)/target/(?P\d+)/dirinfo_filepath/_(?P(?:/[^/\n]+)*)$', 'dirinfo', name='dirinfo_filepath'), - url(r'^build/(?P\d+)/target/(?P\d+)/packages$', 'tpackage', name='targetpackages'), url(r'^build/(?P\d+)/configuration$', 'configuration', name='configuration'), url(r'^build/(?P\d+)/configvars$', 'configvars', name='configvars'), url(r'^build/(?P\d+)/buildtime$', 'buildtime', name='buildtime'), @@ -67,13 +66,9 @@ urlpatterns = patterns('toastergui.views', url(r'^build/(?P\d+)/target/(?P\d+)/packagefile/(?P\d+)$', 'image_information_dir', name='image_information_dir'), - # build download artifact url(r'^build/(?P\d+)/artifact/(?P\w+)/id/(?P\w+)', 'build_artifact', name="build_artifact"), - # urls not linked from the dashboard - url(r'^layerversions/(?P\d+)/recipes/.*$', 'layer_versions_recipes', name='layer_versions_recipes'), - # project URLs url(r'^newproject/$', 'newproject', name='newproject'), diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 23025a2a19..d938fd8280 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -1479,35 +1479,6 @@ def bfile(request, build_id, package_id): context = {'build': Build.objects.get(pk=build_id), 'objects' : files} return render(request, template, context) -def tpackage(request, build_id, target_id): - template = 'package.html' - packages = map(lambda x: x.package, list(Target_Installed_Package.objects.filter(target=target_id))) - context = {'build': Build.objects.get(pk=build_id), 'objects' : packages} - return render(request, template, context) - -def layer(request): - template = 'layer.html' - layer_info = Layer.objects.all() - - for li in layer_info: - li.versions = Layer_Version.objects.filter(layer = li) - for liv in li.versions: - liv.count = Recipe.objects.filter(layer_version__id = liv.id).count() - - context = {'objects': layer_info} - - return render(request, template, context) - - -def layer_versions_recipes(request, layerversion_id): - template = 'recipe.html' - recipes = Recipe.objects.filter(layer_version__id = layerversion_id) - - context = {'objects': recipes, - 'layer_version' : Layer_Version.objects.get( id = layerversion_id ) - } - - return render(request, template, context) # A set of dependency types valid for both included and built package views OTHER_DEPENDS_BASE = [ -- cgit 1.2.3-korg