From acd4a1799d51a9f0b192d12b2c58387595b27bf7 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Fri, 29 Aug 2014 16:41:59 +0100 Subject: bitbake: toaster: add project pages for machines, targets, layers We add new pages for the all-machines and all-targets project-related views. We update the existing template structure to create a base project view, similar to a base build view, that includes a breadcrumb. Updating existing all layers view to use the new structure. We update methods in the models to provide corrent information display. [YOCTO #6592] [YOCTO #6593] (Bitbake rev: 973f582a19441c1ec67061160e4c50ce03ed7b68) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/models.py | 131 +++++++-------- .../toastergui/templates/basebuilddetailpage.html | 0 .../toastergui/templates/baseprojectpage.html | 43 +++++ .../lib/toaster/toastergui/templates/layers.html | 9 +- .../lib/toaster/toastergui/templates/machines.html | 63 +++++++ .../lib/toaster/toastergui/templates/project.html | 69 ++++---- .../lib/toaster/toastergui/templates/recipes.html | 0 .../lib/toaster/toastergui/templates/targets.html | 186 +++++++++++++++++++++ bitbake/lib/toaster/toastergui/views.py | 173 ++++++++++++++++++- 9 files changed, 559 insertions(+), 115 deletions(-) mode change 100755 => 100644 bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html create mode 100644 bitbake/lib/toaster/toastergui/templates/baseprojectpage.html mode change 100755 => 100644 bitbake/lib/toaster/toastergui/templates/layers.html create mode 100644 bitbake/lib/toaster/toastergui/templates/machines.html mode change 100755 => 100644 bitbake/lib/toaster/toastergui/templates/recipes.html create mode 100644 bitbake/lib/toaster/toastergui/templates/targets.html diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index bb921fc98e..77afe35861 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -402,6 +402,18 @@ class Recipe(models.Model): bugtracker = models.URLField(blank=True) file_path = models.FilePathField(max_length=255) + def get_vcs_link_url(self): + if self.layer_version.layer.vcs_web_file_base_url is None: + return "" + return self.layer_version.layer.vcs_web_file_base_url.replace('%path%', self.file_path).replace('%branch%', self.layer_version.up_branch.name) + + def get_layersource_view_url(self): + if self.layer_source is None: + return "" + + url = self.layer_source.get_object_view(self.layer_version.up_branch, "recipes", self.name) + return url + def __unicode__(self): return "Recipe " + self.name + ":" + self.version @@ -508,6 +520,11 @@ class LayerIndexLayerSource(LayerSource): super(LayerIndexLayerSource, self).__init__(args, kwargs) self.sourcetype = LayerSource.TYPE_LAYERINDEX + def get_object_view(self, branch, objectype, upid): + if self != branch.layer_source: + raise Exception("Invalid branch specification") + return self.apiurl + "../branch/" + branch.name + "/" + objectype + "/?q=" + str(upid) + def update(self): ''' Fetches layer, recipe and machine information from remote repository @@ -538,99 +555,79 @@ class LayerIndexLayerSource(LayerSource): return # update branches; only those that we already have names listed in the database - whitelist_branch_names = self.branchnames.split(",") + whitelist_branch_names = map(lambda x: x.name, Branch.objects.all()) branches_info = _get_json_response(apilinks['branches'] + "?filter=name:%s" % "OR".join(whitelist_branch_names)) for bi in branches_info: - try: - b = Branch.objects.get(layer_source = self, name = bi['name']) - b.up_id = bi['id'] - b.up_date = bi['updated'] - b.name = bi['name'] - b.bitbake_branch = bi['bitbake_branch'] - b.short_description = bi['short_description'] - b.save() - except Branch.DoesNotExist: - b = Branch.objects.create( - layer_source = self, - up_id = bi['id'], - up_date = bi['updated'], - name = bi['name'], - bitbake_branch = bi['bitbake_branch'], - short_description = bi['short_description'] - ) + b, created = Branch.objects.get_or_create(layer_source = self, name = bi['name']) + b.up_id = bi['id'] + b.up_date = bi['updated'] + b.name = bi['name'] + b.bitbake_branch = bi['bitbake_branch'] + b.short_description = bi['short_description'] + b.save() # update layers layers_info = _get_json_response(apilinks['layerItems']) for li in layers_info: - try: - l = Layer.objects.get(layer_source = self, - up_id = li['id']) - l.update( - up_date = li['updated'], - name = li['name'], - vcs_url = li['vcs_url'], - vcs_web_file_base_url = li['vcs_url'], - summary = li['summary'], - description = li['description']) - except Layer.DoesNotExist: - Layer.objects.create(layer_source = self, - up_id = li['id'], - up_date = li['updated'], - name = li['name'], - vcs_url = li['vcs_url'], - vcs_web_file_base_url = li['vcs_url'], - summary = li['summary'], - description = li['description'] - ) + l, created = Layer.objects.get_or_create(layer_source = self, up_id = li['id']) + l.up_date = li['updated'] + l.name = li['name'] + l.vcs_url = li['vcs_url'] + l.vcs_web_file_base_url = li['vcs_web_file_base_url'] + l.summary = li['summary'] + l.description = li['description'] + l.save() # update layerbranches/layer_versions layerbranches_info = _get_json_response(apilinks['layerBranches'] + "?filter=branch:%s" % "OR".join(map(lambda x: str(x.up_id), Branch.objects.filter(layer_source = self))) ) for lbi in layerbranches_info: - Layer_Version.objects.get_or_create(layer_source = self, - up_id = lbi['id'], - up_date = lbi['updated'], - layer = Layer.objects.get(layer_source = self, up_id = lbi['layer']), - up_branch = Branch.objects.get(layer_source = self, up_id = lbi['branch']), - branch = lbi['actual_branch'], - commit = lbi['vcs_last_rev'], - dirpath = lbi['vcs_subdir']) + lv, created = Layer_Version.objects.get_or_create(layer_source = self, up_id = lbi['id']) + + lv.up_date = lbi['updated'] + lv.layer = Layer.objects.get(layer_source = self, up_id = lbi['layer']) + lv.up_branch = Branch.objects.get(layer_source = self, up_id = lbi['branch']) + lv.branch = lbi['actual_branch'] + lv.commit = lbi['vcs_last_rev'] + lv.dirpath = lbi['vcs_subdir'] + lv.save() + # update machines machines_info = _get_json_response(apilinks['machines'] + "?filter=layerbranch:%s" % "OR".join(map(lambda x: str(x.up_id), Layer_Version.objects.filter(layer_source = self))) ) for mi in machines_info: - Machine.objects.get_or_create(layer_source = self, - up_id = mi['id'], - up_date = mi['updated'], - layer_version = Layer_Version.objects.get(layer_source = self, up_id = mi['layerbranch']), - name = mi['name'], - description = mi['description']) + mo, created = Machine.objects.get_or_create(layer_source = self, up_id = mi['id']) + mo.up_date = mi['updated'] + mo.layer_version = Layer_Version.objects.get(layer_source = self, up_id = mi['layerbranch']) + mo.name = mi['name'] + mo.description = mi['description'] + mo.save() # update recipes; paginate by layer version / layer branch recipes_info = _get_json_response(apilinks['recipes'] + "?filter=layerbranch:%s" % "OR".join(map(lambda x: str(x.up_id), Layer_Version.objects.filter(layer_source = self))) ) for ri in recipes_info: - Recipe.objects.get_or_create(layer_source = self, - up_id = ri['id'], - up_date = ri['updated'], - layer_version = Layer_Version.objects.get(layer_source = self, up_id = mi['layerbranch']), - - name = ri['pn'], - version = ri['pv'], - summary = ri['summary'], - description = ri['description'], - section = ri['section'], - license = ri['license'], - homepage = ri['homepage'], - bugtracker = ri['bugtracker'], - file_path = ri['filepath'] + ri['filename'] - ) + ro, created = Recipe.objects.get_or_create(layer_source = self, up_id = ri['id']) + + ro.up_date = ri['updated'] + ro.layer_version = Layer_Version.objects.get(layer_source = self, up_id = mi['layerbranch']) + + ro.name = ri['pn'] + ro.version = ri['pv'] + ro.summary = ri['summary'] + ro.description = ri['description'] + ro.section = ri['section'] + ro.license = ri['license'] + ro.homepage = ri['homepage'] + ro.bugtracker = ri['bugtracker'] + ro.file_path = ri['filepath'] + ri['filename'] + ro.save() pass diff --git a/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html b/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html old mode 100755 new mode 100644 diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html new file mode 100644 index 0000000000..54edaaf27c --- /dev/null +++ b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html @@ -0,0 +1,43 @@ +{% extends "base.html" %} +{% load projecttags %} +{% load humanize %} +{% block pagecontent %} + + +
+ +
+ + +
+ +
+ + + {% block projectinfomain %}{% endblock %} + + + +
+
+ + +{% endblock %} + diff --git a/bitbake/lib/toaster/toastergui/templates/layers.html b/bitbake/lib/toaster/toastergui/templates/layers.html old mode 100755 new mode 100644 index d7d159e1e6..bc6e5a3073 --- a/bitbake/lib/toaster/toastergui/templates/layers.html +++ b/bitbake/lib/toaster/toastergui/templates/layers.html @@ -1,7 +1,12 @@ -{% extends "base.html" %} +{% extends "baseprojectpage.html" %} {% load projecttags %} {% load humanize %} -{% block pagecontent %} + +{% block localbreadcrumb %} +
  • Layers
    • +{% endblock %} + +{% block projectinfomain %}

    All layers diff --git a/bitbake/lib/toaster/toastergui/templates/machines.html b/bitbake/lib/toaster/toastergui/templates/machines.html new file mode 100644 index 0000000000..18e7485d50 --- /dev/null +++ b/bitbake/lib/toaster/toastergui/templates/machines.html @@ -0,0 +1,63 @@ +{% extends "baseprojectpage.html" %} +{% load projecttags %} +{% load humanize %} + +{% block localbreadcrumb %} +
  • Machines
    • +{% endblock %} + +{% block projectinfomain %} +
    +

    + All machines + +

    +
    + + + + + +{% include "basetable_top.html" %} + {% for o in objects %} + + + {{o.name}} + + + {{o.description}} + + {{o.file_path}} + + + {{o.layer_version.layer.name}} + {{o.layer_source.name}} + {{o.layer_version.commit}} + + + + + Add layer + + + + + {% endfor %} + +{% include "basetable_bottom.html" %} + +{% endblock %} diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 3c59fcf2ac..d7bfa2b9de 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html @@ -224,36 +224,14 @@ $(document).ready(function () { @@ -315,27 +293,38 @@ $(document).ready(function () {

    +

    - Set machine - + Project machine +

    -

    - {{machine}} - +

    {{machine}} +

    -

    - Set distro - -

    -

    - {{distro}} - +

    +
    + Machine changes have a big impact on build outcome. + You cannot really compare the builds for the new machine with the previous ones. +
    +
    + + + Cancel +
    +

    View all machines

    +
    +

    + Edit configuration variables +

    -

    - Edit configuration variables - -

    +
    + +

    Project details

    diff --git a/bitbake/lib/toaster/toastergui/templates/recipes.html b/bitbake/lib/toaster/toastergui/templates/recipes.html old mode 100755 new mode 100644 diff --git a/bitbake/lib/toaster/toastergui/templates/targets.html b/bitbake/lib/toaster/toastergui/templates/targets.html new file mode 100644 index 0000000000..3afdf0a5e9 --- /dev/null +++ b/bitbake/lib/toaster/toastergui/templates/targets.html @@ -0,0 +1,186 @@ +{% extends "baseprojectpage.html" %} +{% load projecttags %} +{% load humanize %} + +{% block localbreadcrumb %} +
  • Targets
    • +{% endblock %} + +{% block projectinfomain %} +
    +

    + All targets + +

    +
    + + + + + +{% include "basetable_top.html" %} + {% for o in objects %} + + + {{o.name}} ({{o.id}}, {{o.up_id}}) + + + {{o.version}} + {{o.description}} + + {{o.file_path}} + + + {{o.section}} + {{o.license}} + {{o.layer_version.layer.name}} + {{o.layer_source.name}} + {{o.layer_version.commit}} + + + + + Add layer + + + + + {% endfor %} +{% include "basetable_bottom.html" %} + + + + + + + + + + + + + + + + +{% endblock %} diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 86a34adf24..167b687d03 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -1761,7 +1761,7 @@ if toastermain.settings.MANAGED: from django.contrib.auth.decorators import login_required from orm.models import Project, ProjectLayer, ProjectTarget, ProjectVariable - from orm.models import Branch, LayerSource, ToasterSetting, Release + from orm.models import Branch, LayerSource, ToasterSetting, Release, Machine from bldcontrol.models import BuildRequest import traceback @@ -1770,10 +1770,13 @@ if toastermain.settings.MANAGED: # the context processor that supplies data used across all the pages def managedcontextprocessor(request): - return { + ret = { "projects": Project.objects.all(), "MANAGED" : toastermain.settings.MANAGED } + if 'project' in request.session: + ret['project'] = request.session['project'] + return ret # new project def newproject(request): @@ -1922,7 +1925,7 @@ if toastermain.settings.MANAGED: # define here what parameters the view needs in the GET portion in order to # be able to display something. 'count' and 'page' are mandatory for all views # that use paginators. - mandatory_parameters = { 'count': 10, 'page' : 1, 'orderby' : 'layer__name:-' }; + mandatory_parameters = { 'count': 10, 'page' : 1, 'orderby' : 'layer__name:+' }; retval = _verify_parameters( request.GET, mandatory_parameters ) if retval: return _redirect_parameters( 'layers', request.GET, mandatory_parameters) @@ -1945,7 +1948,8 @@ if toastermain.settings.MANAGED: context = { 'objects' : layer_info, 'objectname' : "layers", - 'default_orderby' : 'completed_on:-', + 'default_orderby' : 'layer__name:+', + 'total_count': queryset_with_search.count(), 'tablecols' : [ { 'name': 'Layer', @@ -1954,8 +1958,10 @@ if toastermain.settings.MANAGED: }, { 'name': 'Description', 'dclass': 'span4', + 'clclass': 'description', }, { 'name': 'Layer source', + 'clclass': 'source', 'qhelp': "Where the layer is coming from, for example, if it's part of the OpenEmbedded collection of layers or if it's a layer you have imported", 'orderfield': _get_toggle_order(request, "layer_source__name"), 'ordericon': _get_toggle_order_icon(request, "layer_source__name"), @@ -1967,15 +1973,20 @@ if toastermain.settings.MANAGED: }, { 'name': 'Git repository URL', 'dclass': 'span6', + 'clclass': 'git-repo', 'hidden': 1, 'qhelp': "The Git repository for the layer source code", }, { 'name': 'Subdirectory', + 'clclass': 'git-subdir', + 'hidden': 1, 'qhelp': "The layer directory within the Git repository", }, { 'name': 'Branch, tag o commit', + 'clclass': 'branch', 'qhelp': "The Git branch of the layer. For the layers from the OpenEmbedded source, the branch matches the Yocto Project version you selected for this project", }, { 'name': 'Dependencies', + 'clclass': 'dependencies', 'qhelp': "Other layers a layer depends upon", }, { 'name': 'Add | Delete', @@ -1992,10 +2003,160 @@ if toastermain.settings.MANAGED: raise Exception("TODO: implement page #6591") def targets(request): - raise Exception("TODO: implement page #6592") + template = "targets.html" + # define here what parameters the view needs in the GET portion in order to + # be able to display something. 'count' and 'page' are mandatory for all views + # that use paginators. + mandatory_parameters = { 'count': 10, 'page' : 1, 'orderby' : 'name:+' }; + retval = _verify_parameters( request.GET, mandatory_parameters ) + if retval: + return _redirect_parameters( 'targets', request.GET, mandatory_parameters) + + # boilerplate code that takes a request for an object type and returns a queryset + # for that object type. copypasta for all needed table searches + (filter_string, search_term, ordering_string) = _search_tuple(request, Recipe) + + queryset_all = Recipe.objects.all() + if 'project' in request.session: + queryset_all = queryset_all.filter(Q(layer_version__up_branch__in = Branch.objects.filter(name = request.session['project'].release.name)) | Q(layer_version__build__in = request.session['project'].build_set.all())) + + queryset_with_search = _get_queryset(Recipe, queryset_all, None, search_term, ordering_string, '-name') + queryset = _get_queryset(Recipe, queryset_all, filter_string, search_term, ordering_string, '-name') + + # retrieve the objects that will be displayed in the table; targets a paginator and gets a page range to display + target_info = _build_page_range(Paginator(queryset, request.GET.get('count', 10)),request.GET.get('page', 1)) + + + context = { + 'objects' : target_info, + 'objectname' : "targets", + 'default_orderby' : 'name:+', + 'total_count': queryset_with_search.count(), + + 'tablecols' : [ + { 'name': 'Target', + 'orderfield': _get_toggle_order(request, "name"), + 'ordericon' : _get_toggle_order_icon(request, "name"), + }, + { 'name': 'Target version', + 'dclass': 'span2', + }, + { 'name': 'Description', + 'dclass': 'span5', + 'clclass': 'description', + }, + { 'name': 'Recipe file', + 'clclass': 'recipe-file', + 'hidden': 1, + 'dclass': 'span5', + }, + { 'name': 'Section', + 'clclass': 'target-section', + 'hidden': 1, + }, + { 'name': 'License', + 'clclass': 'license', + 'hidden': 1, + }, + { 'name': 'Layer', + 'clclass': 'layer', + }, + { 'name': 'Layer source', + 'clclass': 'source', + 'qhelp': "Where the target is coming from, for example, if it's part of the OpenEmbedded collection of targets or if it's a target you have imported", + 'orderfield': _get_toggle_order(request, "layer_source__name"), + 'ordericon': _get_toggle_order_icon(request, "layer_source__name"), + 'filter': { + 'class': 'target', + 'label': 'Show:', + 'options': map(lambda x: (x.name, 'layer_source__pk:' + str(x.id), queryset_with_search.filter(layer_source__pk = x.id).count() ), LayerSource.objects.all()), + } + }, + { 'name': 'Branch, tag or commit', + 'clclass': 'branch', + 'hidden': 1, + }, + { 'name': 'Build', + 'dclass': 'span2', + 'qhelp': "Add or delete targets to / from your project ", + }, + + ] + } + + return render(request, template, context) def machines(request): - raise Exception("TODO: implement page #6593") + template = "machines.html" + # define here what parameters the view needs in the GET portion in order to + # be able to display something. 'count' and 'page' are mandatory for all views + # that use paginators. + mandatory_parameters = { 'count': 10, 'page' : 1, 'orderby' : 'name:+' }; + retval = _verify_parameters( request.GET, mandatory_parameters ) + if retval: + return _redirect_parameters( 'machines', request.GET, mandatory_parameters) + + # boilerplate code that takes a request for an object type and returns a queryset + # for that object type. copypasta for all needed table searches + (filter_string, search_term, ordering_string) = _search_tuple(request, Machine) + + queryset_all = Machine.objects.all() +# if 'project' in request.session: +# queryset_all = queryset_all.filter(Q(layer_version__up_branch__in = Branch.objects.filter(name = request.session['project'].release.name)) | Q(layer_version__build__in = request.session['project'].build_set.all())) + + queryset_with_search = _get_queryset(Machine, queryset_all, None, search_term, ordering_string, '-name') + queryset = _get_queryset(Machine, queryset_all, filter_string, search_term, ordering_string, '-name') + + # retrieve the objects that will be displayed in the table; machines a paginator and gets a page range to display + machine_info = _build_page_range(Paginator(queryset, request.GET.get('count', 10)),request.GET.get('page', 1)) + + + context = { + 'objects' : machine_info, + 'objectname' : "machines", + 'default_orderby' : 'name:+', + 'total_count': queryset_with_search.count(), + + 'tablecols' : [ + { 'name': 'Machine', + 'orderfield': _get_toggle_order(request, "name"), + 'ordericon' : _get_toggle_order_icon(request, "name"), + }, + { 'name': 'Description', + 'dclass': 'span5', + 'clclass': 'description', + }, + { 'name': 'Machine file', + 'clclass': 'machine-file', + 'hidden': 1, + }, + { 'name': 'Layer', + 'clclass': 'layer', + }, + { 'name': 'Layer source', + 'clclass': 'source', + 'qhelp': "Where the machine is coming from, for example, if it's part of the OpenEmbedded collection of machines or if it's a machine you have imported", + 'orderfield': _get_toggle_order(request, "layer_source__name"), + 'ordericon': _get_toggle_order_icon(request, "layer_source__name"), + 'filter': { + 'class': 'machine', + 'label': 'Show:', + 'options': map(lambda x: (x.name, 'layer_source__pk:' + str(x.id), queryset_with_search.filter(layer_source__pk = x.id).count() ), LayerSource.objects.all()), + } + }, + { 'name': 'Branch, tag or commit', + 'clclass': 'branch', + 'hidden': 1, + }, + { 'name': 'Select', + 'dclass': 'span2', + 'qhelp': "Add or delete machines to / from your project ", + }, + + ] + } + + return render(request, template, context) def projectconf(request, pid): raise Exception("TODO: implement page #6588") -- cgit v1.2.3-54-g00ecf