Improve SoftwareRelease_getRelatedNetworkList and Usable computer

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

@@ -50,20 +50,11 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>software_release_url = context.getUrlString()\n
-portal = context.getPortalObject()\n
-network_list = []\n
-\n
-kw[\'portal_type\']=\'Computer Network\'\n
-kw[\'validation_state\']=\'validated\'\n
-\n
-full_network_list = portal.portal_catalog(**kw)\n
-for network in full_network_list:\n
-  computer_list = network.getSubordinationRelatedValueList()\n
-  for computer in computer_list:\n
-    if software_release_url in computer.Computer_getSoftwareReleaseUrlStringList():\n
-      network_list.append(network)\n
-      break\n
+            <value> <string>network_list = []\n
+for computer in context.SoftwareRelease_getUsableComputerList():\n
+  network = computer.getSubordinationValue()\n
+  if network and not network in network_list:\n
+    network_list.append(network)\n
 \n
 return network_list\n
 </string> </value>

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

@@ -50,10 +50,13 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>software_installation_list = context.portal_catalog(url_string=context.getUrlString(),\n
-                       portal_type=\'Software Installation\', validation_state=\'validated\')\n
+            <value> <string>kw[\'portal_type\'] = \'Software Installation\'\n
+kw[\'validation_state\'] = \'validated\'\n
+kw[\'url_string\'] = context.getUrlString()\n
+\n
+software_installation_list = context.portal_catalog(**kw)\n
 computer_list = []\n
-allocation_scope_list = [\'open/personal\', \'open/public\', \'open/frien\']\n
+allocation_scope_list = [\'open/personal\', \'open/public\', \'open/friend\']\n
 for software_installation in software_installation_list:\n
   computer = software_installation.getAggregateValue()\n
   if software_installation.getSlapState() == \'start_requested\' and \\\n

master/bt5/slapos_cloud/bt/revision

-317
\ No newline at end of file
+318
\ No newline at end of file