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
Arnaud Véron
slapos.core
Commits
029f1c52
Commit
029f1c52
authored
Sep 14, 2022
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Minor fixes
See merge request
!419
parents
5a6cc2c0
f2edc9e1
Changes
10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
7 additions
and
364 deletions
+7
-364
master/bt5/slapos_crm/ActionTemplateItem/portal_types/Incident%20Response%20Module/rss_view.xml
...em/portal_types/Incident%20Response%20Module/rss_view.xml
+1
-1
master/bt5/slapos_crm/ActionTemplateItem/portal_types/Regularisation%20Request%20Module/rss_view.xml
...rtal_types/Regularisation%20Request%20Module/rss_view.xml
+1
-1
master/bt5/slapos_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/rss_view.xml
...Item/portal_types/Support%20Request%20Module/rss_view.xml
+1
-1
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Base_getActivePayableUserAmount.py
.../slapos_crm_monitoring/Base_getActivePayableUserAmount.py
+0
-9
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Base_getActivePayableUserAmount.xml
...slapos_crm_monitoring/Base_getActivePayableUserAmount.xml
+0
-62
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Folder_viewOpenTicketFeedURLDialog.xml
...pos_crm_monitoring/Folder_viewOpenTicketFeedURLDialog.xml
+1
-1
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Folder_viewOpenTicketFeedURLDialog/your_feed_url.xml
...ring/Folder_viewOpenTicketFeedURLDialog/your_feed_url.xml
+0
-0
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/InstanceTreeModule_viewResilienceUsageReport.xml
...nitoring/InstanceTreeModule_viewResilienceUsageReport.xml
+0
-1
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/InstanceTreeModule_viewResilienceUsageReport/your_payable_active_users.xml
...e_viewResilienceUsageReport/your_payable_active_users.xml
+0
-287
master/bt5/slapos_crm/TestTemplateItem/portal_components/test.erp5.testSlapOSCRMSkins.py
...ateItem/portal_components/test.erp5.testSlapOSCRMSkins.py
+3
-1
No files found.
master/bt5/slapos_crm/ActionTemplateItem/portal_types/Incident%20Response%20Module/rss_view.xml
View file @
029f1c52
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
text
</string>
</key>
<key>
<string>
text
</string>
</key>
<value>
<string>
string:${object_url}/Folder_viewOpenTicketFeedURL
</string>
</value>
<value>
<string>
string:${object_url}/Folder_viewOpenTicketFeedURL
Dialog
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_crm/ActionTemplateItem/portal_types/Regularisation%20Request%20Module/rss_view.xml
View file @
029f1c52
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
text
</string>
</key>
<key>
<string>
text
</string>
</key>
<value>
<string>
string:${object_url}/Folder_viewOpenTicketFeedURL
</string>
</value>
<value>
<string>
string:${object_url}/Folder_viewOpenTicketFeedURL
Dialog
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/rss_view.xml
View file @
029f1c52
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
text
</string>
</key>
<key>
<string>
text
</string>
</key>
<value>
<string>
string:${object_url}/Folder_viewOpenTicketFeedURL
</string>
</value>
<value>
<string>
string:${object_url}/Folder_viewOpenTicketFeedURL
Dialog
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Base_getActivePayableUserAmount.py
deleted
100644 → 0
View file @
5a6cc2c0
from
DateTime
import
DateTime
if
start_date
is
None
:
start_date
=
">=%s"
%
(
DateTime
()
-
45
).
strftime
(
"%Y/%m/%d"
)
return
len
(
context
.
portal_catalog
(
portal_type
=
"Payment Transaction"
,
group_by
=
[
'delivery.destination_section_uid'
],
simulation_state
=
[
"stopped"
,
"delivered"
],
start_date
=
">=2017/05/01"
))
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Base_getActivePayableUserAmount.xml
deleted
100644 → 0
View file @
5a6cc2c0
<?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>
start_date=None
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
Base_getActivePayableUserAmount
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Folder_viewOpenTicketFeedURL.xml
→
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Folder_viewOpenTicketFeedURL
Dialog
.xml
View file @
029f1c52
...
@@ -91,7 +91,7 @@
...
@@ -91,7 +91,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
Folder_viewOpenTicketFeedURL
</string>
</value>
<value>
<string>
Folder_viewOpenTicketFeedURL
Dialog
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
method
</string>
</key>
<key>
<string>
method
</string>
</key>
...
...
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Folder_viewOpenTicketFeedURL/your_feed_url.xml
→
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Folder_viewOpenTicketFeedURL
Dialog
/your_feed_url.xml
View file @
029f1c52
File moved
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/InstanceTreeModule_viewResilienceUsageReport.xml
View file @
029f1c52
...
@@ -107,7 +107,6 @@
...
@@ -107,7 +107,6 @@
<value>
<value>
<list>
<list>
<string>
your_resilient_percentage
</string>
<string>
your_resilient_percentage
</string>
<string>
your_payable_active_users
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/InstanceTreeModule_viewResilienceUsageReport/your_payable_active_users.xml
deleted
100644 → 0
View file @
5a6cc2c0
This diff is collapsed.
Click to expand it.
master/bt5/slapos_crm/TestTemplateItem/portal_components/test.erp5.testSlapOSCRMSkins.py
View file @
029f1c52
...
@@ -1614,7 +1614,9 @@ class TestSlapOSPerson_getSlapOSPendingTicketMessageTemplate(TestCRMSkinsMixin):
...
@@ -1614,7 +1614,9 @@ class TestSlapOSPerson_getSlapOSPendingTicketMessageTemplate(TestCRMSkinsMixin):
title
,
message
=
person
.
Person_getSlapOSPendingTicketMessageTemplate
()
title
,
message
=
person
.
Person_getSlapOSPendingTicketMessageTemplate
()
self
.
assertEqual
(
'Pending ticket'
,
title
)
self
.
assertEqual
(
'Pending ticket'
,
title
)
self
.
assertEqual
(
'Test NM content Member Template AMOUNT (99) WEBSITE()'
,
message
)
web_site_url
=
self
.
portal
.
portal_preferences
.
getPreferredSlaposWebSiteUrl
()
self
.
assertEqual
(
message
,
'Test NM content Member Template AMOUNT (99) WEBSITE(%s)'
%
web_site_url
)
class
TestSlapOSPerson_sendPendingTicketReminder
(
TestCRMSkinsMixin
):
class
TestSlapOSPerson_sendPendingTicketReminder
(
TestCRMSkinsMixin
):
...
...
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