slapos_cloud: also search allocation supply by node

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/AllocationSupplyCell_asPredicate.py

 line = context.getParentValue()
 supply = line.getParentValue()
-if (supply.getPortalType() != 'Allocation Supply') or (supply.getValidationState() != 'validated'):
+if (supply.getPortalType() != 'Allocation Supply') or (supply.getValidationState() != 'validated') or (supply.getAggregate(None) is None):
   return None
 
 if not context.isAllocable():
   return None
 
-base_category_tuple = ('resource', 'software_type', 'software_release', 'destination_project')
+base_category_tuple = ('resource', 'software_type', 'software_release', 'destination_project', 'aggregate')
 
 if supply.getDestination():
   base_category_tuple += ('destination',)
 
+
 return context.generatePredicate(membership_criterion_base_category_list = base_category_tuple,
                                                  criterion_property_list = ('start_date',))

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Project_getSoftwareProductPredicateList.py

@@ -16,7 +16,10 @@ if software_product is not None:
 if destination_value is None:
   destination_value = portal.portal_membership.getAuthenticatedMember().getUserValue()
 
-if len(tested_base_category_list) == 5:
+if node_value is not None:
+  tested_base_category_list.append('aggregate')
+
+if len(tested_base_category_list) == 6:
   tested_base_category_list = None
 
 if predicate_portal_type is None:
@@ -30,6 +33,7 @@ tmp_context = portal.portal_trash.newContent(
   software_release_value=software_product_release,
   destination_value=destination_value,
   destination_project_value=project,
+  aggregate_value=node_value,
   start_date=DateTime()
 )
 

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Project_getSoftwareProductPredicateList.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>software_product=None, software_product_type=None, software_product_release=None, destination_value=None, predicate_portal_type=None</string> </value>
+            <value> <string>software_product=None, software_product_type=None, software_product_release=None, destination_value=None, node_value=None, predicate_portal_type=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>