diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_getSoftwareInstanceList.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_getSoftwareInstanceList.xml
deleted file mode 100644
index 48ab8c4b8c4617128c8722db35102f61c41b3928..0000000000000000000000000000000000000000
--- a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_getSoftwareInstanceList.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string>portal = context.getPortalObject()\n
-subscription_item = context\n
-\n
-line_list = context.portal_catalog(\n
- portal_type=["Sale Order Line", "Sale Packing List Line"],\n
- default_resource_uid=portal.restrictedTraverse(context.portal_preferences.getPreferredInstanceSetupResource()).getUid(),\n
- default_aggregate_uid=subscription_item.getUid())\n
-\n
-portal_type_list = ["Software Instance", "Slave Instance"]\n
-instance_dict = dict([(x.getAggregate(portal_type=portal_type_list), 0) for x in line_list])\n
-return [portal.restrictedTraverse(x) for x in instance_dict.keys()]\n
-</string> </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>**kw</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>HostingSubscription_getSoftwareInstanceList</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/listbox.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/listbox.xml
index ac2b6169781bc5fa209c758a3afa9b444f3fbacc..e6ba17c702111624d0ea7444614cad9bf92133b0 100644
--- a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/listbox.xml
+++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/listbox.xml
@@ -11,8 +11,10 @@
<value>
<list>
<string>columns</string>
+ <string>default_params</string>
<string>editable_columns</string>
<string>list_method</string>
+ <string>portal_types</string>
<string>search</string>
<string>select</string>
<string>selection_name</string>
@@ -59,6 +61,20 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default_params</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -72,9 +88,23 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>selection_name</string> </key>
+ <key> <string>portal_types</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>search</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>select</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>selection_name</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
@@ -83,6 +113,10 @@
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>url_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -113,6 +147,17 @@
</list>
</value>
</item>
+ <item>
+ <key> <string>default_params</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>checked_permission</string>
+ <string>View</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>editable_columns</string> </key>
<value>
@@ -139,7 +184,22 @@
<item>
<key> <string>list_method</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_types</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>Software Instance</string>
+ <string>Software Instance</string>
+ </tuple>
+ <tuple>
+ <string>Slave Instance</string>
+ <string>Slave Instance</string>
+ </tuple>
+ </list>
</value>
</item>
<item>
@@ -184,6 +244,32 @@
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: [(\'specialise_uid\', here.getUid()), (\'validation_state\', \'validated\')]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: \'hosting_subscription_%s_instance_list\' % here.getUid()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
@@ -191,7 +277,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
- <value> <string>HostingSubscription_getSoftwareInstanceList</string> </value>
+ <value> <string>portal_catalog</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/master/bt5/vifib_web/bt/revision b/master/bt5/vifib_web/bt/revision
index 6efca19ea0b6814902678d61d3b643d78797c000..9f8ebf73f949262f1ac9e31f985774ae5fd52a31 100644
--- a/master/bt5/vifib_web/bt/revision
+++ b/master/bt5/vifib_web/bt/revision
@@ -1 +1 @@
-481
\ No newline at end of file
+482
\ No newline at end of file