From 4d0bc8d52130fcc62c0d239fd7e0c79bec188c88 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Mon, 26 Sep 2016 13:59:28 +0300 Subject: bitbake: toaster: Clean up and convert to rest api project edit and get calls Convert the project xhr calls into proper rest api and port the client side calls to use the new API. Fix all the pyflakes identified issues and clean up unused fields. Also remove the api and client side code for changing release on the fly as this is no longer supported. [YOCTO #9519] (Bitbake rev: 8b01767d6e787cdb09789116ebf57dfb70f521bc) Signed-off-by: Michael Wood Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/views.py | 131 +------------------------------- 1 file changed, 3 insertions(+), 128 deletions(-) (limited to 'bitbake/lib/toaster/toastergui/views.py') diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 365a1e88ff..2efb0fd56c 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -1361,136 +1361,11 @@ if True: raise Exception("Invalid HTTP method for this page") - - # Shows the edit project page - @_template_renderer('project.html') def project(request, pid): - prj = Project.objects.get(id = pid) - - try: - puser = User.objects.get(id = prj.user_id) - except User.DoesNotExist: - puser = None - - # execute POST requests - if request.method == "POST": - # add layers - if 'layerAdd' in request.POST and len(request.POST['layerAdd']) > 0: - for lc in Layer_Version.objects.filter(pk__in=[i for i in request.POST['layerAdd'].split(",") if len(i) > 0]): - ProjectLayer.objects.get_or_create(project = prj, layercommit = lc) - - # remove layers - if 'layerDel' in request.POST and len(request.POST['layerDel']) > 0: - for t in request.POST['layerDel'].strip().split(" "): - pt = ProjectLayer.objects.filter(project = prj, layercommit_id = int(t)).delete() - - if 'projectName' in request.POST: - prj.name = request.POST['projectName'] - prj.save(); - - if 'projectVersion' in request.POST: - # If the release is the current project then return now - if prj.release.pk == int(request.POST.get('projectVersion',-1)): - return {} - - prj.release = Release.objects.get(pk = request.POST['projectVersion']) - # we need to change the bitbake version - prj.bitbake_version = prj.release.bitbake_version - prj.save() - # we need to change the layers - for project in prj.projectlayer_set.all(): - # find and add a similarly-named layer on the new branch - try: - layer_versions = prj.get_all_compatible_layer_versions() - layer_versions = layer_versions.filter(layer__name = project.layercommit.layer.name) - ProjectLayer.objects.get_or_create(project = prj, layercommit = layer_versions.first()) - except IndexError: - pass - finally: - # get rid of the old entry - project.delete() - - if 'machineName' in request.POST: - machinevar = prj.projectvariable_set.get(name="MACHINE") - machinevar.value=request.POST['machineName'] - machinevar.save() - - - # we use implicit knowledge of the current user's project to filter layer information, e.g. - pid = prj.id - - from collections import Counter - - freqtargets = Counter(Target.objects.filter( - Q(build__project=prj), - ~Q(build__outcome=Build.IN_PROGRESS) - ).order_by("target").values_list("target", flat=True)) - - freqtargets = freqtargets.most_common(5) - - # We now have the targets in order of frequency but if there are two - # with the same frequency then we need to make sure those are in - # alphabetical order without losing the frequency ordering - - tmp = [] - switch = None - for i, freqtartget in enumerate(freqtargets): - target, count = freqtartget - try: - target_next, count_next = freqtargets[i+1] - if count == count_next and target > target_next: - switch = target - continue - except IndexError: - pass - - tmp.append(target) - - if switch: - tmp.append(switch) - switch = None - - freqtargets = tmp - - layers = [{"id": x.layercommit.pk, "orderid": x.pk, "name" : x.layercommit.layer.name, - "vcs_url": x.layercommit.layer.vcs_url, "local_source_dir": x.layercommit.layer.local_source_dir, "vcs_reference" : x.layercommit.get_vcs_reference(), - "url": x.layercommit.layer.layer_index_url, "layerdetailurl": x.layercommit.get_detailspage_url(prj.pk), - "branch" : {"name" : x.layercommit.get_vcs_reference(), - "layersource" : x.layercommit.layer_source } - } for x in prj.projectlayer_set.all().order_by("id")] - - context = { - "project" : prj, - "lvs_nos" : Layer_Version.objects.all().count(), - "completedbuilds": Build.objects.exclude(outcome = Build.IN_PROGRESS).filter(project_id = pid), - "prj" : {"name": prj.name, }, - "buildrequests" : prj.build_set.filter(outcome=Build.IN_PROGRESS), - "builds" : Build.get_recent(prj), - "layers" : layers, - "targets" : [{"target" : x.target, "task" : x.task, "pk": x.pk} for x in prj.projecttarget_set.all()], - "variables": [(x.name, x.value) for x in prj.projectvariable_set.all()], - "freqtargets": freqtargets, - "releases": [{"id": x.pk, "name": x.name, "description":x.description} for x in Release.objects.all()], - "project_html": 1, - "recipesTypeAheadUrl": reverse('xhr_recipestypeahead', args=(prj.pk,)), - "projectBuildsUrl": reverse('projectbuilds', args=(prj.pk,)), - } - - if prj.release is not None: - context['release'] = { "id": prj.release.pk, "name": prj.release.name, "description": prj.release.description} - - - try: - context["machine"] = {"name": prj.projectvariable_set.get(name="MACHINE").value} - except ProjectVariable.DoesNotExist: - context["machine"] = None - try: - context["distro"] = prj.projectvariable_set.get(name="DISTRO").value - except ProjectVariable.DoesNotExist: - context["distro"] = "-- not set yet" - - return context + project = Project.objects.get(pk=pid) + context = {"project": project} + return render(request, "project.html", context) def jsunittests(request): """ Provides a page for the js unit tests """ -- cgit v1.2.3-54-g00ecf