diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-07-21 14:43:27 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-26 08:10:36 +0100 |
commit | ef627d0ab8f5cf2fc72005393e76047cb623ff3d (patch) | |
tree | ae0067545010621d688baea77197ec50c7db7acc /bitbake/lib/toaster/toastergui/views.py | |
parent | ffc78d329d6fed9ae9a0db470d30033069b42f8f (diff) | |
download | poky-ef627d0ab8f5cf2fc72005393e76047cb623ff3d.tar.gz |
bitbake: toaster: Replace references to LayerSource models
Replace references to the now deprecated layersource models across
Toaster with the new enums for layer source types.
(Bitbake rev: 48c09c62eb979d840132e58144f0d81ffee675b1)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/views.py')
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 56 |
1 files changed, 38 insertions, 18 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index aab6536fa0..d19815f661 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -1452,9 +1452,8 @@ if True: | |||
1452 | layers = [{"id": x.layercommit.pk, "orderid": x.pk, "name" : x.layercommit.layer.name, | 1452 | layers = [{"id": x.layercommit.pk, "orderid": x.pk, "name" : x.layercommit.layer.name, |
1453 | "vcs_url": x.layercommit.layer.vcs_url, "vcs_reference" : x.layercommit.get_vcs_reference(), | 1453 | "vcs_url": x.layercommit.layer.vcs_url, "vcs_reference" : x.layercommit.get_vcs_reference(), |
1454 | "url": x.layercommit.layer.layer_index_url, "layerdetailurl": x.layercommit.get_detailspage_url(prj.pk), | 1454 | "url": x.layercommit.layer.layer_index_url, "layerdetailurl": x.layercommit.get_detailspage_url(prj.pk), |
1455 | # This branch name is actually the release | ||
1456 | "branch" : {"name" : x.layercommit.get_vcs_reference(), | 1455 | "branch" : {"name" : x.layercommit.get_vcs_reference(), |
1457 | "layersource" : x.layercommit.up_branch.layer_source.name if x.layercommit.up_branch != None else None} | 1456 | "layersource" : x.layercommit.layer_source } |
1458 | } for x in prj.projectlayer_set.all().order_by("id")] | 1457 | } for x in prj.projectlayer_set.all().order_by("id")] |
1459 | 1458 | ||
1460 | context = { | 1459 | context = { |
@@ -1670,10 +1669,7 @@ if True: | |||
1670 | 1669 | ||
1671 | # We need to know what release the current project is so that we | 1670 | # We need to know what release the current project is so that we |
1672 | # can set the imported layer's up_branch_id | 1671 | # can set the imported layer's up_branch_id |
1673 | prj_branch_name = Release.objects.get(pk=prj.release_id).branch_name | ||
1674 | up_branch, branch_created = Branch.objects.get_or_create(name=prj_branch_name, layer_source_id=LayerSource.TYPE_IMPORTED) | ||
1675 | 1672 | ||
1676 | layer_source = LayerSource.objects.get(sourcetype=LayerSource.TYPE_IMPORTED) | ||
1677 | try: | 1673 | try: |
1678 | layer, layer_created = Layer.objects.get_or_create(name=post_data['name']) | 1674 | layer, layer_created = Layer.objects.get_or_create(name=post_data['name']) |
1679 | except MultipleObjectsReturned: | 1675 | except MultipleObjectsReturned: |
@@ -1681,7 +1677,6 @@ if True: | |||
1681 | 1677 | ||
1682 | if layer: | 1678 | if layer: |
1683 | if layer_created: | 1679 | if layer_created: |
1684 | layer.layer_source = layer_source | ||
1685 | layer.vcs_url = post_data['vcs_url'] | 1680 | layer.vcs_url = post_data['vcs_url'] |
1686 | layer.up_date = timezone.now() | 1681 | layer.up_date = timezone.now() |
1687 | layer.save() | 1682 | layer.save() |
@@ -1692,12 +1687,24 @@ if True: | |||
1692 | if layer.vcs_url != post_data['vcs_url']: | 1687 | if layer.vcs_url != post_data['vcs_url']: |
1693 | return HttpResponse(jsonfilter({"error": "hint-layer-exists-with-different-url" , "current_url" : layer.vcs_url, "current_id": layer.id }), content_type = "application/json") | 1688 | return HttpResponse(jsonfilter({"error": "hint-layer-exists-with-different-url" , "current_url" : layer.vcs_url, "current_id": layer.id }), content_type = "application/json") |
1694 | 1689 | ||
1695 | 1690 | layer_version, version_created = \ | |
1696 | layer_version, version_created = Layer_Version.objects.get_or_create(layer_source=layer_source, layer=layer, project=prj, up_branch_id=up_branch.id,branch=post_data['git_ref'], commit=post_data['git_ref'], dirpath=post_data['dir_path']) | 1691 | Layer_Version.objects.get_or_create( |
1692 | layer_source=LayerSource.TYPE_IMPORTED, | ||
1693 | layer=layer, project=prj, | ||
1694 | release=prj.release, | ||
1695 | branch=post_data['git_ref'], | ||
1696 | commit=post_data['git_ref'], | ||
1697 | dirpath=post_data['dir_path']) | ||
1697 | 1698 | ||
1698 | if layer_version: | 1699 | if layer_version: |
1699 | if not version_created: | 1700 | if not version_created: |
1700 | return HttpResponse(jsonfilter({"error": "hint-layer-version-exists", "existing_layer_version": layer_version.id }), content_type = "application/json") | 1701 | return HttpResponse(jsonfilter({"error": |
1702 | "hint-layer-version-exists", | ||
1703 | "existing_layer_version": | ||
1704 | layer_version.id }), | ||
1705 | content_type = "application/json") | ||
1706 | |||
1707 | layer_version.layer_source = LayerSource.TYPE_IMPORTED | ||
1701 | 1708 | ||
1702 | layer_version.up_date = timezone.now() | 1709 | layer_version.up_date = timezone.now() |
1703 | layer_version.save() | 1710 | layer_version.save() |
@@ -2179,20 +2186,33 @@ if True: | |||
2179 | } | 2186 | } |
2180 | return render(request, template, context) | 2187 | return render(request, template, context) |
2181 | 2188 | ||
2189 | # TODO merge with api pseudo api here is used for deps modal | ||
2182 | @_template_renderer('layerdetails.html') | 2190 | @_template_renderer('layerdetails.html') |
2183 | def layerdetails(request, pid, layerid): | 2191 | def layerdetails(request, pid, layerid): |
2184 | project = Project.objects.get(pk=pid) | 2192 | project = Project.objects.get(pk=pid) |
2185 | layer_version = Layer_Version.objects.get(pk=layerid) | 2193 | layer_version = Layer_Version.objects.get(pk=layerid) |
2186 | 2194 | ||
2187 | context = {'project' : project, | 2195 | project_layers = ProjectLayer.objects.filter( |
2188 | 'layerversion' : layer_version, | 2196 | project=project).values_list("layercommit_id", |
2189 | 'layerdeps' : {"list": [{"id": dep.id, | 2197 | flat=True) |
2190 | "name": dep.layer.name, | 2198 | |
2191 | "layerdetailurl": reverse('layerdetails', args=(pid, dep.pk)), | 2199 | context = { |
2192 | "vcs_url": dep.layer.vcs_url, | 2200 | 'project': project, |
2193 | "vcs_reference": dep.get_vcs_reference()} \ | 2201 | 'layer_source': LayerSource.types_dict(), |
2194 | for dep in layer_version.get_alldeps(project.id)]}, | 2202 | 'layerversion': layer_version, |
2195 | 'projectlayers': [player.layercommit.id for player in ProjectLayer.objects.filter(project=project)] | 2203 | 'layerdeps': { |
2204 | "list": [ | ||
2205 | { | ||
2206 | "id": dep.id, | ||
2207 | "name": dep.layer.name, | ||
2208 | "layerdetailurl": reverse('layerdetails', | ||
2209 | args=(pid, dep.pk)), | ||
2210 | "vcs_url": dep.layer.vcs_url, | ||
2211 | "vcs_reference": dep.get_vcs_reference() | ||
2212 | } | ||
2213 | for dep in layer_version.get_alldeps(project.id)] | ||
2214 | }, | ||
2215 | 'projectlayers': list(project_layers) | ||
2196 | } | 2216 | } |
2197 | 2217 | ||
2198 | return context | 2218 | return context |