Simplify.

master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_getCurrentHostingSubscriptionList.xml

@@ -53,42 +53,15 @@
             <value> <string>from Products.ZSQLCatalog.SQLCatalog import NegatedQuery, Query\n
 \n
 portal = context.getPortalObject()\n
-person_uid = portal.ERP5Site_getPropertyFromAuthenticatedMemberPersonValue(\'uid\')\n
 person_reference = portal.ERP5Site_getPropertyFromAuthenticatedMemberPersonValue(\'reference\')\n
 \n
-setup_service = portal.restrictedTraverse(portal.portal_preferences.getPreferredInstanceSetupResource())\n
-\n
 # XXX Owner column should not be used to fetch the list!\n
 # Data model of hosting subscription should be fixed to allow direct query\n
-hosting_subscription_list = portal.portal_catalog(\n
+return portal.portal_catalog(\n
   portal_type="Hosting Subscription",\n
   owner=person_reference,\n
+  validation_state=\'validated\'\n
   )\n
-\n
-# Only return ongoing hosting subscription\n
-return [x for x in hosting_subscription_list if \\\n
-  (len(portal.portal_catalog(\n
-    portal_type="Sale Packing List Line",\n
-    simulation_state=NegatedQuery(Query(simulation_state="delivered")),\n
-    default_resource_uid=setup_service.getUid(),\n
-    default_aggregate_uid=x.getUid(),\n
-    limit=1,\n
-  )) == 1) or \\\n
-  (\n
-    (len(portal.portal_catalog(\n
-     portal_type="Sale Packing List Line",\n
-     default_resource_uid=setup_service.getUid(),\n
-     default_aggregate_uid=x.getUid(),\n
-     limit=1,\n
-    )) == 0) and \\\n
-    (len(portal.portal_catalog(\n
-     portal_type="Sale Order Line",\n
-     default_resource_uid=setup_service.getUid(),\n
-     simulation_state="cancelled",\n
-     default_aggregate_uid=x.getUid(),\n
-     limit=1,\n
-    )) == 0)\n
-  )]\n
 </string> </value>
         </item>
         <item>

master/bt5/vifib_web/bt/revision

-378
+379
\ No newline at end of file