summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-05-08 17:33:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-12 12:14:13 +0100
commit3c4f3775f73e9a85949d5ad59f15e2df790020fa (patch)
tree3d1fdf9f85331d4a28eebcf31d0ec0b8a0b34919
parente7f4d9c8e1cf578819c5042826d57b5a9222f7a1 (diff)
downloadpoky-3c4f3775f73e9a85949d5ad59f15e2df790020fa.tar.gz
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 <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/toastergui/templates/layer.html34
-rw-r--r--bitbake/lib/toaster/toastergui/templates/package.html36
-rw-r--r--bitbake/lib/toaster/toastergui/urls.py5
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py29
4 files changed, 0 insertions, 104 deletions
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 @@
1{% extends "basetable.html" %}
2
3{% block pagename %}
4 <h1>Toaster - Layers</h1>
5{% endblock %}
6
7{% block pagetable %}
8 {% load projecttags %}
9
10 <tr>
11 <th>Name</th>
12 <th>Local Path</th>
13 <th>Layer Index URL</th>
14 <th>Known Versions</th>
15 </tr>
16
17 {% for layer in objects %}
18
19 <tr class="data">
20 <td>{{layer.name}}</td>
21 <td>{{layer.local_path}}</td>
22 <td><a href='{{layer.layer_index_url}}'>{{layer.layer_index_url}}</a></td>
23 <td><table>
24 {% for lv in layer.versions %}
25 <tr><td>
26 <a href="{% url "layer_versions_recipes" lv.id %}">({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes)</a>
27 </td></tr>
28 {% endfor %}
29 </table></td>
30 </tr>
31
32 {% endfor %}
33
34{% 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 @@
1{% extends "basebuildpage.html" %}
2
3{% block pagetable %}
4 {% if not objects %}
5 <p>No packages were recorded for this target!</p>
6 {% else %}
7
8 <tr>
9 <th>Name</th>
10 <th>Version</th>
11 <th>Size (Bytes)</th>
12 <th>Recipe</th>
13 <th>Depends on</th>
14 </tr>
15
16 {% for package in objects %}
17
18 <tr class="data">
19 <td><a name="#{{package.name}}">{{package.name}}</a></td>
20 <td>{{package.version}}</td>
21 <td>{{package.size}}</td>
22 <td>{%if package.recipe %}<a name="{{package.recipe.name}}.{{package.package_name}}">
23 <a href="{% url "layer_versions_recipes" package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td>
24 <td>
25 <div style="height: 4em; overflow:auto">
26 {% for d in package.package_dependencies_source.all %}
27 <a href="#{{d.name}}">{{d.depends_on.name}}</a><br/>
28 {% endfor %}
29 </div>
30 </td>
31
32 {% endfor %}
33
34 {% endif %}
35
36{% 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',
56 url(r'^dentries/build/(?P<build_id>\d+)/target/(?P<target_id>\d+)$', 'dirinfo_ajax', name='dirinfo_ajax'), 56 url(r'^dentries/build/(?P<build_id>\d+)/target/(?P<target_id>\d+)$', 'dirinfo_ajax', name='dirinfo_ajax'),
57 url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/dirinfo$', 'dirinfo', name='dirinfo'), 57 url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/dirinfo$', 'dirinfo', name='dirinfo'),
58 url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/dirinfo_filepath/_(?P<file_path>(?:/[^/\n]+)*)$', 'dirinfo', name='dirinfo_filepath'), 58 url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/dirinfo_filepath/_(?P<file_path>(?:/[^/\n]+)*)$', 'dirinfo', name='dirinfo_filepath'),
59 url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/packages$', 'tpackage', name='targetpackages'),
60 url(r'^build/(?P<build_id>\d+)/configuration$', 'configuration', name='configuration'), 59 url(r'^build/(?P<build_id>\d+)/configuration$', 'configuration', name='configuration'),
61 url(r'^build/(?P<build_id>\d+)/configvars$', 'configvars', name='configvars'), 60 url(r'^build/(?P<build_id>\d+)/configvars$', 'configvars', name='configvars'),
62 url(r'^build/(?P<build_id>\d+)/buildtime$', 'buildtime', name='buildtime'), 61 url(r'^build/(?P<build_id>\d+)/buildtime$', 'buildtime', name='buildtime'),
@@ -67,13 +66,9 @@ urlpatterns = patterns('toastergui.views',
67 url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/packagefile/(?P<packagefile_id>\d+)$', 66 url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/packagefile/(?P<packagefile_id>\d+)$',
68 'image_information_dir', name='image_information_dir'), 67 'image_information_dir', name='image_information_dir'),
69 68
70
71 # build download artifact 69 # build download artifact
72 url(r'^build/(?P<build_id>\d+)/artifact/(?P<artifact_type>\w+)/id/(?P<artifact_id>\w+)', 'build_artifact', name="build_artifact"), 70 url(r'^build/(?P<build_id>\d+)/artifact/(?P<artifact_type>\w+)/id/(?P<artifact_id>\w+)', 'build_artifact', name="build_artifact"),
73 71
74 # urls not linked from the dashboard
75 url(r'^layerversions/(?P<layerversion_id>\d+)/recipes/.*$', 'layer_versions_recipes', name='layer_versions_recipes'),
76
77 # project URLs 72 # project URLs
78 url(r'^newproject/$', 'newproject', name='newproject'), 73 url(r'^newproject/$', 'newproject', name='newproject'),
79 74
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):
1479 context = {'build': Build.objects.get(pk=build_id), 'objects' : files} 1479 context = {'build': Build.objects.get(pk=build_id), 'objects' : files}
1480 return render(request, template, context) 1480 return render(request, template, context)
1481 1481
1482def tpackage(request, build_id, target_id):
1483 template = 'package.html'
1484 packages = map(lambda x: x.package, list(Target_Installed_Package.objects.filter(target=target_id)))
1485 context = {'build': Build.objects.get(pk=build_id), 'objects' : packages}
1486 return render(request, template, context)
1487
1488def layer(request):
1489 template = 'layer.html'
1490 layer_info = Layer.objects.all()
1491
1492 for li in layer_info:
1493 li.versions = Layer_Version.objects.filter(layer = li)
1494 for liv in li.versions:
1495 liv.count = Recipe.objects.filter(layer_version__id = liv.id).count()
1496
1497 context = {'objects': layer_info}
1498
1499 return render(request, template, context)
1500
1501
1502def layer_versions_recipes(request, layerversion_id):
1503 template = 'recipe.html'
1504 recipes = Recipe.objects.filter(layer_version__id = layerversion_id)
1505
1506 context = {'objects': recipes,
1507 'layer_version' : Layer_Version.objects.get( id = layerversion_id )
1508 }
1509
1510 return render(request, template, context)
1511 1482
1512# A set of dependency types valid for both included and built package views 1483# A set of dependency types valid for both included and built package views
1513OTHER_DEPENDS_BASE = [ 1484OTHER_DEPENDS_BASE = [