slapos_cloud: Drop Base_getNewsDict

   Rely on getAccessStatus Instead

master/bt5/slapos_cloud/MixinTemplateItem/portal_components/mixin.erp5.SlapOSCacheMixin.py

@@ -65,22 +65,36 @@ class SlapOSCacheMixin:
     return self.getAccessStatus()['text']
 
   def getAccessStatus(self):
-    data_dict = self._getCachedAccessInfo()
+    data_json = self._getCachedAccessInfo()
     last_modified = rfc1123_date(DateTime())
-    if data_dict is None:
+    if data_json is None:
       data_dict = {
           "user": "SlapOS Master",
           'created_at': '%s' % last_modified,
           'since': '%s' % last_modified,
           'state': "",
-          "text": "#error no data found for %s" % self.getReference()
+          "text": "#error no data found for %s" % self.getReference(),
+          "no_data": 1
         }
       # Prepare for xml marshalling
-      data_dict["user"] = data_dict["user"].decode("UTF-8")
       data_dict["text"] = data_dict["text"].decode("UTF-8")
       return data_dict
 
-    return  json.loads(data_dict)
+    data_dict = json.loads(data_json)
+    last_contact = DateTime(data_dict.get('created_at'))
+    data_dict["no_data_since_15_minutes"] = 0
+    data_dict["no_data_since_5_minutes"] = 0
+    if (DateTime() - last_contact) > 0.005:
+      data_dict["no_data_since_15_minutes"] = 1
+      data_dict["no_data_since_5_minutes"] = 1
+    elif (DateTime() - last_contact) > 0.0025:
+      data_dict["no_data_since_5_minutes"] = 1
+    
+
+    # Prepare for xml marshalling
+    data_dict["user"] = data_dict["user"].decode("UTF-8")
+    data_dict["text"] = data_dict["text"].decode("UTF-8")
+    return  data_dict
 
   def setAccessStatus(self, text, state=""):
     user_reference = self.getPortalObject().portal_membership.getAuthenticatedMember()\

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getNewsDict.py

-import json
-from DateTime import DateTime
-
-memcached_dict = context.Base_getSlapToolMemcachedDict()
-try:
-  d = memcached_dict[document.getReference()]
-except (KeyError, TypeError):
-  d = {
-    "user": "SlapOS Master",
-    "text": "#error no data found for %s" % document.getReference(),
-    "no_data": 1
-  }
-else:
-  d = json.loads(d)
-  last_contact = DateTime(d.get('created_at'))
-  d["no_data_since_15_minutes"] = 0
-  d["no_data_since_5_minutes"] = 0
-  if (DateTime() - last_contact) > 0.005:
-    d["no_data_since_15_minutes"] = 1
-    d["no_data_since_5_minutes"] = 1
-  elif (DateTime() - last_contact) > 0.0025:
-    d["no_data_since_5_minutes"] = 1
-
-return d

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getNewsDict.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>_params</string> </key>
-            <value> <string>document</string> </value>
-        </item>
-        <item>
-            <key> <string>_proxy_roles</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>Base_getNewsDict</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>