From 70a078ee851b0408b68ddc13fbc7fbb658ce38df Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Tue, 8 Dec 2015 19:52:42 +0000 Subject: bitbake: toaster: tables SelectPackagesTable rename recipe_id to custrecipeid Rename the recipe_id to custrecipeid to avoid confusion about which type of object we're going to be accessing. This means that in the unit tests for tables we can pass a different kwargs for custom recipes vs normal recipes. (Bitbake rev: ae3301a1047b3efb4b340b50a10d5d585b7333da) Signed-off-by: Michael Wood Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/tables.py | 12 ++++++++---- bitbake/lib/toaster/toastergui/urls.py | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index 48829351b4..d80b90254a 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py @@ -728,7 +728,8 @@ class SelectPackagesTable(PackagesTable): self.title = "Add | Remove packages" def setup_queryset(self, *args, **kwargs): - cust_recipe = CustomImageRecipe.objects.get(pk=kwargs['recipeid']) + self.cust_recipe =\ + CustomImageRecipe.objects.get(pk=kwargs['custrecipeid']) prj = Project.objects.get(pk = kwargs['pid']) current_packages = self.cust_recipe.get_all_packages() @@ -747,13 +748,16 @@ class SelectPackagesTable(PackagesTable): self.queryset = self.queryset.order_by('name') - self.static_context_extra['recipe_id'] = kwargs['recipeid'] + self.static_context_extra['recipe_id'] = kwargs['custrecipeid'] self.static_context_extra['current_packages'] = \ - cust_recipe.packages.values_list('pk', flat=True) + current_packages.values_list('pk', flat=True) def get_context_data(self, **kwargs): + # to reuse the Super class map the custrecipeid to the recipe_id + kwargs['recipe_id'] = kwargs['custrecipeid'] context = super(SelectPackagesTable, self).get_context_data(**kwargs) - custom_recipe = CustomImageRecipe.objects.get(pk=kwargs['recipe_id']) + custom_recipe = \ + CustomImageRecipe.objects.get(pk=kwargs['custrecipeid']) context['recipe'] = custom_recipe context['approx_pkg_size'] = \ diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py index 969a29b228..4feeebc14a 100644 --- a/bitbake/lib/toaster/toastergui/urls.py +++ b/bitbake/lib/toaster/toastergui/urls.py @@ -129,11 +129,11 @@ urlpatterns = patterns('toastergui.views', name=tables.LayerMachinesTable.__name__.lower()), - url(r'^project/(?P\d+)/customrecipe/(?P\d+)/selectpackages/$', + url(r'^project/(?P\d+)/customrecipe/(?P\d+)/selectpackages/$', tables.SelectPackagesTable.as_view(), name="recipeselectpackages"), - url(r'^project/(?P\d+)/customrecipe/(?P\d+)$', + url(r'^project/(?P\d+)/customrecipe/(?P\d+)$', tables.SelectPackagesTable.as_view(template_name="customrecipe.html"), name="customrecipe"), -- cgit v1.2.3-54-g00ecf