Commit 967274c8 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

erp5_computer_immobilisation: Only add api_revision to Computer JSON when defined

parent 7b539437
...@@ -61,6 +61,9 @@ class Computer(Machine, JSONType): ...@@ -61,6 +61,9 @@ class Computer(Machine, JSONType):
, PropertySheet.JSONTypeConstraint , PropertySheet.JSONTypeConstraint
) )
def useRevision(self):
return getattr(self, "use_jio_api_revision", False)
security.declareProtected(Permissions.AccessContentsInformation, security.declareProtected(Permissions.AccessContentsInformation,
'asJSONText') 'asJSONText')
def asJSONText(self): def asJSONText(self):
...@@ -77,10 +80,13 @@ class Computer(Machine, JSONType): ...@@ -77,10 +80,13 @@ class Computer(Machine, JSONType):
"title": self.getTitle().decode("UTF-8"), "title": self.getTitle().decode("UTF-8"),
"compute_partition_list": [], "compute_partition_list": [],
} }
web_section = self.getWebSectionValue() if self.useRevision():
web_section = web_section.getRelativeUrl() if web_section else self.REQUEST.get("web_section_relative_url", None) web_section = self.getWebSectionValue()
if web_section: web_section = web_section.getRelativeUrl() if web_section else self.REQUEST.get("web_section_relative_url", None)
compute_node_dict["api_revision"] = self.getJIOAPIRevision(web_section) if web_section:
revision = self.getJIOAPIRevision(web_section)
if revision:
compute_node_dict["api_revision"] = revision
compute_partition_list = self.contentValues( compute_partition_list = self.contentValues(
portal_type="Compute Partition", portal_type="Compute Partition",
checked_permission="View" checked_permission="View"
......
...@@ -6,12 +6,6 @@ ...@@ -6,12 +6,6 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>Computer</string> </value> <value> <string>Computer</string> </value>
...@@ -59,28 +53,13 @@ ...@@ -59,28 +53,13 @@
<item> <item>
<key> <string>workflow_history</string> </key> <key> <string>workflow_history</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -93,7 +72,7 @@ ...@@ -93,7 +72,7 @@
<item> <item>
<key> <string>component_validation_workflow</string> </key> <key> <string>component_validation_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -102,7 +81,7 @@ ...@@ -102,7 +81,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
......
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