From 1aa97e7d29b8e31a29a93a4e07bbfd0dec38667f Mon Sep 17 00:00:00 2001
From: Gabriel Monnerat <gabriel@tiolive.com>
Date: Tue, 26 Jul 2011 00:36:46 -0300
Subject: [PATCH] remove checkPermission because is not used and add the
 reference of each Slave Instance. The reference is used to generated the key
 to access it

---
 ...wareInstanceComputerPartitionMergedDict.xml | 18 ++++++++++--------
 master/bt5/vifib_slap/bt/revision              |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SalePackingListLine_asSoftwareInstanceComputerPartitionMergedDict.xml b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SalePackingListLine_asSoftwareInstanceComputerPartitionMergedDict.xml
index 01cca5ddf..c74b56df3 100644
--- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SalePackingListLine_asSoftwareInstanceComputerPartitionMergedDict.xml
+++ b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SalePackingListLine_asSoftwareInstanceComputerPartitionMergedDict.xml
@@ -50,12 +50,11 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>checkPermission = context.getPortalObject().portal_membership.checkPermission\n
-sale_packing_list_line = context\n
+            <value> <string>sale_packing_list_line = context\n
 instance_type_list = [\'Software Instance\', \'Slave Instance\']\n
 software_instance = sale_packing_list_line.getAggregateValue(portal_type=instance_type_list)\n
 computer_partition = sale_packing_list_line.getAggregateValue(portal_type=\'Computer Partition\')\n
-software_release = sale_packing_list_line.getAggregateValue(portal_type=\'Software Release\')\n
+software_release = sale_packing_list_line.getAggregateValue(portal_type="Software Release")\n
 ip_list = []\n
 if computer_partition.getPortalType() == \'Computer Partition\':\n
   for internet_protocol_address in computer_partition.contentValues(portal_type=\'Internet Protocol Address\'):\n
@@ -68,10 +67,13 @@ if software_instance is not None and computer_partition is not None and software
     if instance is None:\n
       continue\n
     elif instance.getPortalType() == "Slave Instance":\n
-      slave_instance_list.append(dict(slap_software_type=instance.getSourceReference(),\n
-                                      xml=instance.getTextContent(),\n
-                                      connection_xml=instance.getConnectionXml(),\n
-                                     ))\n
+      slave_instance = dict(slap_software_type=instance.getSourceReference(),\n
+                            slave_reference=instance.getReference(),\n
+                            xml=instance.getTextContent(),\n
+                            connection_xml=instance.getConnectionXml(),\n
+                            )\n
+      if slave_instance not in slave_instance_list:\n
+        slave_instance_list.append(slave_instance)\n
     elif instance.getPortalType() == "Software Instance":\n
       software_instance = instance\n
   return {\n
@@ -82,7 +84,7 @@ if software_instance is not None and computer_partition is not None and software
     \'slap_software_type\': software_instance.getSourceReference(),\n
     \'slap_software_release_url\':software_release.getUrlString(),\n
     \'slap_server_url\':context.getPortalObject().portal_slap.absolute_url(),\n
-    \'slave_instance_list\':slave_instance_list,\n
+    \'slave_instance_list\': slave_instance_list,\n
     \'ip_list\':ip_list,\n
   }\n
 \n
diff --git a/master/bt5/vifib_slap/bt/revision b/master/bt5/vifib_slap/bt/revision
index c0220a2ad..93168a9d7 100644
--- a/master/bt5/vifib_slap/bt/revision
+++ b/master/bt5/vifib_slap/bt/revision
@@ -1 +1 @@
-397
\ No newline at end of file
+398
\ No newline at end of file
-- 
2.30.9