Commit 029f1c52 authored by Rafael Monnerat's avatar Rafael Monnerat

Minor fixes

See merge request nexedi/slapos.core!419
parents 5a6cc2c0 f2edc9e1
Pipeline #23515 passed with stage
in 0 seconds
...@@ -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_viewOpenTicketFeedURLDialog</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -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_viewOpenTicketFeedURLDialog</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -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_viewOpenTicketFeedURLDialog</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
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" ))
<?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>
...@@ -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_viewOpenTicketFeedURLDialog</string> </value>
</item> </item>
<item> <item>
<key> <string>method</string> </key> <key> <string>method</string> </key>
......
...@@ -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>
......
...@@ -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):
......
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