Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos.core
Commits
f2b9e3d4
Commit
f2b9e3d4
authored
Jan 13, 2022
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: Drop Base_getNewsDict
Rely on getAccessStatus Instead
parent
f705e44e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
99 deletions
+19
-99
master/bt5/slapos_cloud/MixinTemplateItem/portal_components/mixin.erp5.SlapOSCacheMixin.py
...lateItem/portal_components/mixin.erp5.SlapOSCacheMixin.py
+19
-5
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getNewsDict.py
...emplateItem/portal_skins/slapos_cloud/Base_getNewsDict.py
+0
-24
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getNewsDict.xml
...mplateItem/portal_skins/slapos_cloud/Base_getNewsDict.xml
+0
-70
No files found.
master/bt5/slapos_cloud/MixinTemplateItem/portal_components/mixin.erp5.SlapOSCacheMixin.py
View file @
f2b9e3d4
...
...
@@ -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
deleted
100644 → 0
View file @
f705e44e
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
deleted
100644 → 0
View file @
f705e44e
<?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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment