slapos_panel: change Compute Node usage report columns

Show instance url_string and type.
Hide owner / image / creation_date

master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/listbox.xml

@@ -14,6 +14,7 @@
                 <string>count_method</string>
                 <string>default_params</string>
                 <string>hide_rows_on_no_search_criterion</string>
+                <string>lines</string>
                 <string>list_method</string>
                 <string>portal_types</string>
                 <string>select</string>
@@ -88,6 +89,10 @@
                     <key> <string>hide_rows_on_no_search_criterion</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>lines</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>list_method</string> </key>
                     <value> <string></string> </value>
@@ -106,6 +111,10 @@
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
+                <item>
+                    <key> <string>sort</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
@@ -129,10 +138,6 @@
                     <key> <string>columns</string> </key>
                     <value>
                       <list>
-                        <tuple>
-                          <string>software_release</string>
-                          <string>Title</string>
-                        </tuple>
                         <tuple>
                           <string>url_string</string>
                           <string>URL</string>
@@ -180,6 +185,10 @@
                     <key> <string>hide_rows_on_no_search_criterion</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>lines</string> </key>
+                    <value> <int>50</int> </value>
+                </item>
                 <item>
                     <key> <string>list_method</string> </key>
                     <value>

master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/my_busy_compute_partition_list.xml

@@ -382,7 +382,16 @@
                 <item>
                     <key> <string>all_columns</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <tuple>
+                          <string>creation_date</string>
+                          <string>Instance Creation Date</string>
+                        </tuple>
+                        <tuple>
+                          <string>ComputePartition_getOwnerName</string>
+                          <string>Owner</string>
+                        </tuple>
+                      </list>
                     </value>
                 </item>
                 <item>
@@ -409,18 +418,6 @@
                           <string>instance_tree_title</string>
                           <string>Instance Tree</string>
                         </tuple>
-                        <tuple>
-                          <string>image</string>
-                          <string>Image</string>
-                        </tuple>
-                        <tuple>
-                          <string>ComputePartition_getOwnerName</string>
-                          <string>Owner</string>
-                        </tuple>
-                        <tuple>
-                          <string>creation_date</string>
-                          <string>Instance Creation Date</string>
-                        </tuple>
                         <tuple>
                           <string>ComputePartition_getLastestContactedDate</string>
                           <string>Latest Contact Date</string>
@@ -534,7 +531,7 @@
                 </item>
                 <item>
                     <key> <string>lines</string> </key>
-                    <value> <int>10</int> </value>
+                    <value> <int>100</int> </value>
                 </item>
                 <item>
                     <key> <string>list_action</string> </key>

master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/my_busy_compute_partition_list_instance_title.xml

@@ -125,7 +125,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: cell.getAggregateRelatedTitle(portal_type=["Software Instance"])</string> </value>
+            <value> <string>python: \'; \'.join([\'%s - %s\' % (x.getUrlString(), x.getSourceReference()) for x in cell.getAggregateRelatedValueList(portal_type=["Software Instance"]) if x is not None])</string> </value>
         </item>
       </dictionary>
     </pickle>