Show software state on computer view.

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

+<?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>from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery\n
+portal = context.getPortalObject()\n
+\n
+computer = context.REQUEST.get(\'here\')\n
+software_release = context\n
+\n
+delivery_line = portal.portal_catalog.getResultValue(\n
+  portal_type=\'Purchase Packing List Line\',\n
+  default_resource_uid=[portal.restrictedTraverse(portal.portal_preferences.getPreferredSoftwareSetupResource()).getUid(), portal.restrictedTraverse(portal.portal_preferences.getPreferredSoftwareCleanupResource()).getUid()],\n
+  default_aggregate_uid=ComplexQuery(\n
+    Query(default_aggregate_uid=computer.getUid()),\n
+    Query(default_aggregate_uid=software_release.getUid()),\n
+    operator=\'AND\'\n
+  ),\n
+  simulation_state=portal.getPortalCurrentInventoryStateList() + portal.getPortalReservedInventoryStateList() + portal.getPortalTransitInventoryStateList(),\n
+  limit=1,\n
+  sort_on=((\'movement.start_date\', \'DESC\'),),\n
+)\n
+\n
+resource = delivery_line.getResource()\n
+state = delivery_line.getSimulationState()\n
+\n
+if resource == portal.portal_preferences.getPreferredSoftwareSetupResource():\n
+  if state == \'confirmed\':\n
+    return \'Installation requested\'\n
+  elif state == \'started\':\n
+    return \'Installation in progress\'\n
+  elif state == \'stopped\':\n
+    return \'Installed\'\n
+  else:\n
+    return \'Destroyed\'\n
+elif resource == portal.portal_preferences.getPreferredSoftwareCleanupResource():\n
+  if state == \'confirmed\':\n
+    return \'Destruction requested\'\n
+  else:\n
+    return \'Destroyed\'\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>*args, **kwargs</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Base_getSoftwareReleaseStateOnComputer</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

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

@@ -90,6 +90,7 @@
                         <string>listbox_software_release</string>
                         <string>listbox_parent_state</string>
                         <string>listbox_image</string>
+                        <string>listbox_installation_state</string>
                       </list>
                     </value>
                 </item>

master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/Computer_viewAsWeb/listbox.xml

@@ -104,6 +104,10 @@
                           <string>version</string>
                           <string>Version</string>
                         </tuple>
+                        <tuple>
+                          <string>installation_state</string>
+                          <string>State</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>
@@ -153,6 +157,10 @@
                           <string>image</string>
                           <string></string>
                         </tuple>
+                        <tuple>
+                          <string>installation_state</string>
+                          <string></string>
+                        </tuple>
                       </list>
                     </value>
                 </item>

master/bt5/vifib_web/bt/revision

-342
+343
\ No newline at end of file