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
Cédric Le Ninivin
slapos.core
Commits
9d89f640
Commit
9d89f640
authored
Oct 07, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Inform user that his contract is disabled
He can access it or open a ticket.
parent
d9e55c3e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
146 additions
and
117 deletions
+146
-117
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_attention_point_js.js
...tem/web_page_module/rjs_gadget_erp5_attention_point_js.js
+16
-11
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_attention_point_js.xml
...em/web_page_module/rjs_gadget_erp5_attention_point_js.xml
+108
-102
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getAttentionPointList.py
...skins/slapos_hal_json_style/Base_getAttentionPointList.py
+22
-4
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_attention_point_js.js
View file @
9d89f640
...
@@ -21,10 +21,16 @@
...
@@ -21,10 +21,16 @@
});
});
function
createAttentionPointTemplate
(
gadget
,
attention_point
)
{
function
createAttentionPointTemplate
(
gadget
,
attention_point
)
{
var
page
=
"
slap_controller
"
,
option_dict
=
{};
if
(
attention_point
.
link
||
attention_point
.
page
)
{
if
(
attention_point
.
page
)
{
page
=
attention_point
.
page
;
}
option_dict
.
page
=
page
;
if
(
attention_point
.
link
)
{
if
(
attention_point
.
link
)
{
return
gadget
.
getUrlFor
({
command
:
'
change
'
,
option_dict
.
jio_key
=
attention_point
.
link
;
options
:
{
jio_key
:
attention_point
.
link
,
}
"
page
"
:
"
slap_controller
"
}
})
return
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
option_dict
})
.
push
(
function
(
link
)
{
.
push
(
function
(
link
)
{
return
gadget
.
translateHtml
(
attention_point_item_template
({
return
gadget
.
translateHtml
(
attention_point_item_template
({
option
:
[{
option
:
[{
...
@@ -33,7 +39,7 @@
...
@@ -33,7 +39,7 @@
}]
}]
}));
}));
});
});
}
else
{
}
return
gadget
.
translateHtml
(
attention_point_item_template
({
return
gadget
.
translateHtml
(
attention_point_item_template
({
option
:
[{
option
:
[{
text
:
attention_point
.
text
,
text
:
attention_point
.
text
,
...
@@ -41,7 +47,6 @@
...
@@ -41,7 +47,6 @@
}]
}]
}));
}));
}
}
}
gadget_klass
gadget_klass
//////////////////////////////////////////////
//////////////////////////////////////////////
// acquired method
// acquired method
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_attention_point_js.xml
View file @
9d89f640
...
@@ -142,11 +142,13 @@
...
@@ -142,11 +142,13 @@
</record>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
patches.WorkflowTool
"
/>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
Workflow
"
/>
</pickle>
</pickle>
<pickle>
<pickle>
<tuple>
<dictionary>
<none/>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<list>
<dictionary>
<dictionary>
<item>
<item>
...
@@ -190,17 +192,20 @@
...
@@ -190,17 +192,20 @@
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
<none/>
</value>
</tuple>
</item>
</dictionary>
</pickle>
</pickle>
</record>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
patches.WorkflowTool
"
/>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
Workflow
"
/>
</pickle>
</pickle>
<pickle>
<pickle>
<tuple>
<dictionary>
<none/>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<list>
<dictionary>
<dictionary>
<item>
<item>
...
@@ -223,7 +228,7 @@
...
@@ -223,7 +228,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
975.18542.14811.50363
</string>
</value>
<value>
<string>
987.9086.39006.59579
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -241,7 +246,7 @@
...
@@ -241,7 +246,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1556600431.66
</float>
<float>
1602096464.77
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
@@ -250,8 +255,9 @@
...
@@ -250,8 +255,9 @@
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
<none/>
</value>
</tuple>
</item>
</dictionary>
</pickle>
</pickle>
</record>
</record>
</ZopeData>
</ZopeData>
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getAttentionPointList.py
View file @
9d89f640
...
@@ -2,6 +2,8 @@ from json import dumps
...
@@ -2,6 +2,8 @@ from json import dumps
attention_point_list
=
[]
attention_point_list
=
[]
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
portal_type
=
context
.
getPortalType
()
def
addAttentionForTicket
(
ticket
):
def
addAttentionForTicket
(
ticket
):
msg
=
None
msg
=
None
...
@@ -18,9 +20,8 @@ def addAttentionForTicket(ticket):
...
@@ -18,9 +20,8 @@ def addAttentionForTicket(ticket):
if
msg
:
if
msg
:
return
{
"text"
:
msg
,
"link"
:
ticket
.
getRelativeUrl
()}
return
{
"text"
:
msg
,
"link"
:
ticket
.
getRelativeUrl
()}
# Display unresponded tickets on services or servers
# Display unresponded tickets on services or servers
if
context
.
getPortalType
()
in
[
"Hosting Subscription"
,
"Computer"
]:
if
portal_type
in
[
"Hosting Subscription"
,
"Computer"
]:
simulation_state
=
[
"suspended"
,
"confirmed"
]
simulation_state
=
[
"suspended"
,
"confirmed"
]
for
ticket
in
context
.
Base_getOpenRelatedTicketList
(
for
ticket
in
context
.
Base_getOpenRelatedTicketList
(
limit
=
3
,
simulation_state
=
simulation_state
):
limit
=
3
,
simulation_state
=
simulation_state
):
...
@@ -30,7 +31,7 @@ if context.getPortalType() in ["Hosting Subscription", "Computer"]:
...
@@ -30,7 +31,7 @@ if context.getPortalType() in ["Hosting Subscription", "Computer"]:
# This is a limitation of the API that will consider that all tickets
# This is a limitation of the API that will consider that all tickets
# Are from this module
# Are from this module
if
context
.
getPortalType
()
in
[
"Support Request Module"
]:
if
portal_type
in
[
"Support Request Module"
]:
simulation_state
=
[
"suspended"
,
"confirmed"
]
simulation_state
=
[
"suspended"
,
"confirmed"
]
person
=
portal
.
portal_membership
.
getAuthenticatedMember
().
getUserValue
()
person
=
portal
.
portal_membership
.
getAuthenticatedMember
().
getUserValue
()
for
ticket
in
portal
.
portal_catalog
(
for
ticket
in
portal
.
portal_catalog
(
...
@@ -42,4 +43,21 @@ if context.getPortalType() in ["Support Request Module"]:
...
@@ -42,4 +43,21 @@ if context.getPortalType() in ["Support Request Module"]:
if
entry
is
not
None
:
if
entry
is
not
None
:
attention_point_list
.
append
(
entry
)
attention_point_list
.
append
(
entry
)
if
portal_type
in
[
"Hosting Subscription Module"
,
"Hosting Subscription"
,
"Person"
]:
person
=
portal
.
portal_membership
.
getAuthenticatedMember
().
getUserValue
()
contract
=
portal
.
portal_catalog
.
getResultValue
(
portal_type
=
"Cloud Contract"
,
default_destination_section_uid
=
person
.
getUid
(),
validation_state
=
[
'invalidated'
,
'validated'
],
)
if
contract
is
None
:
msg
=
context
.
Base_translateString
(
"Your Contract is Desactivated"
)
attention_point_list
.
append
({
"text"
:
msg
,
'page'
:
"slap_ticket_list"
})
elif
contract
.
getValidationState
()
==
"invalidated"
:
msg
=
context
.
Base_translateString
(
"Your Contract is Desactivated"
)
attention_point_list
.
append
({
"text"
:
msg
,
"link"
:
contract
.
getRelativeUrl
()})
return
dumps
(
attention_point_list
)
return
dumps
(
attention_point_list
)
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