- Fix generic variable names such as "object" and "values" when not needed. - Use try catch instead of a queryset filter to return the custom recipe object - Be explicit about the fields returned for the custom recipe info field - Remove redundant new_package field
Signed-off-by: Michael Wood <[email protected]> --- bitbake/lib/toaster/toastergui/views.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 53553a5..d569ffe 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -2731,20 +2731,23 @@ if True: or {"error": <error message>} """ - objects = CustomImageRecipe.objects.filter(id=recipe_id) - if not objects: + try: + custom_recipe = CustomImageRecipe.objects.get(id=recipe_id) + except CustomImageRecipe.DoesNotExist: return {"error": "Custom recipe with id=%s " "not found" % recipe_id} + if request.method == 'GET': - values = CustomImageRecipe.objects.filter(id=recipe_id).values() - if values: - return {"error": "ok", "info": values[0]} - else: - return {"error": "Custom recipe with id=%s " - "not found" % recipe_id} - return {"error": "ok", "info": objects.values()[0]} + info = {"id" : custom_recipe.id, + "name" : custom_recipe.name, + "base_recipe_id": custom_recipe.base_recipe.id, + "project_id": custom_recipe.project.id, + } + + return {"error": "ok", "info": info} + elif request.method == 'DELETE': - objects.delete() + custom_recipe.delete() return {"error": "ok"} else: return {"error": "Method %s is not supported" % request.method} @@ -2820,10 +2823,6 @@ if True: dependencies = filter(in_image, dependencies['runtime_deps']) return {"error": "ok", - "new_package" : {"id": package.pk, - "url": reverse('xhr_customrecipe_packages', - args=(recipe.pk, package.pk)) - }, "dependencies_needed" : dependencies, } -- 2.1.4 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
