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 <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7e4c231ca2
commit
70a078ee85
|
@ -728,7 +728,8 @@ class SelectPackagesTable(PackagesTable):
|
||||||
self.title = "Add | Remove packages"
|
self.title = "Add | Remove packages"
|
||||||
|
|
||||||
def setup_queryset(self, *args, **kwargs):
|
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'])
|
prj = Project.objects.get(pk = kwargs['pid'])
|
||||||
|
|
||||||
current_packages = self.cust_recipe.get_all_packages()
|
current_packages = self.cust_recipe.get_all_packages()
|
||||||
|
@ -747,13 +748,16 @@ class SelectPackagesTable(PackagesTable):
|
||||||
|
|
||||||
self.queryset = self.queryset.order_by('name')
|
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'] = \
|
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):
|
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)
|
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['recipe'] = custom_recipe
|
||||||
context['approx_pkg_size'] = \
|
context['approx_pkg_size'] = \
|
||||||
|
|
|
@ -129,11 +129,11 @@ urlpatterns = patterns('toastergui.views',
|
||||||
name=tables.LayerMachinesTable.__name__.lower()),
|
name=tables.LayerMachinesTable.__name__.lower()),
|
||||||
|
|
||||||
|
|
||||||
url(r'^project/(?P<pid>\d+)/customrecipe/(?P<recipeid>\d+)/selectpackages/$',
|
url(r'^project/(?P<pid>\d+)/customrecipe/(?P<custrecipeid>\d+)/selectpackages/$',
|
||||||
tables.SelectPackagesTable.as_view(), name="recipeselectpackages"),
|
tables.SelectPackagesTable.as_view(), name="recipeselectpackages"),
|
||||||
|
|
||||||
|
|
||||||
url(r'^project/(?P<pid>\d+)/customrecipe/(?P<recipe_id>\d+)$',
|
url(r'^project/(?P<pid>\d+)/customrecipe/(?P<custrecipeid>\d+)$',
|
||||||
tables.SelectPackagesTable.as_view(template_name="customrecipe.html"),
|
tables.SelectPackagesTable.as_view(template_name="customrecipe.html"),
|
||||||
name="customrecipe"),
|
name="customrecipe"),
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue