Commit 10c41789 authored by Gabriel Monnerat's avatar Gabriel Monnerat

remove useless condition and rename variable

parent 46bfbe41
...@@ -64,18 +64,16 @@ if software_instance is not None and computer_partition is not None and software ...@@ -64,18 +64,16 @@ if software_instance is not None and computer_partition is not None and software
slave_instance_list = []\n slave_instance_list = []\n
sale_packing_list_line_list = computer_partition.getAggregateRelatedValueList(portal_type="Sale Packing List Line")\n sale_packing_list_line_list = computer_partition.getAggregateRelatedValueList(portal_type="Sale Packing List Line")\n
for sale_packing_list_line in sale_packing_list_line_list:\n for sale_packing_list_line in sale_packing_list_line_list:\n
if checkPermission("Access contents information", sale_packing_list_line):\n instance = sale_packing_list_line.getAggregateValue(portal_type=instance_type_list)\n
instance = sale_packing_list_line.getAggregateValue(portal_type=instance_type_list)\n if instance is None:\n
if instance is None:\n continue\n
continue\n elif instance.getPortalType() == "Slave Instance":\n
elif instance.getPortalType() == "Slave Instance":\n slave_instance_list.append(dict(slap_software_type=instance.getSourceReference(),\n
slave_instance_list.append(dict(slap_software_type=instance.getSourceReference(),\n xml=instance.getTextContent(),\n
xml=instance.getTextContent(),\n connection_xml=instance.getConnectionXml(),\n
connection_xml=instance.getConnectionXml(),\n ))\n
))\n elif instance.getPortalType() == "Software Instance":\n
elif instance.getPortalType() == "Software Instance":\n software_instance = instance\n
software_instance = instance\n
\n
return {\n return {\n
\'xml\':software_instance.getTextContent(),\n \'xml\':software_instance.getTextContent(),\n
\'connection_xml\':software_instance.getConnectionXml(),\n \'connection_xml\':software_instance.getConnectionXml(),\n
...@@ -87,6 +85,7 @@ if software_instance is not None and computer_partition is not None and software ...@@ -87,6 +85,7 @@ if software_instance is not None and computer_partition is not None and software
\'slave_instance_list\':slave_instance_list,\n \'slave_instance_list\':slave_instance_list,\n
\'ip_list\':ip_list,\n \'ip_list\':ip_list,\n
}\n }\n
\n
return None\n return None\n
</string> </value> </string> </value>
</item> </item>
......
386 387
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment