Minor fixes

See merge request nexedi/slapos.core!419

master/bt5/slapos_crm/ActionTemplateItem/portal_types/Incident%20Response%20Module/rss_view.xml

@@ -79,7 +79,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Folder_viewOpenTicketFeedURL</string> </value>
+            <value> <string>string:${object_url}/Folder_viewOpenTicketFeedURLDialog</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_crm/ActionTemplateItem/portal_types/Regularisation%20Request%20Module/rss_view.xml

@@ -79,7 +79,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Folder_viewOpenTicketFeedURL</string> </value>
+            <value> <string>string:${object_url}/Folder_viewOpenTicketFeedURLDialog</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/rss_view.xml

@@ -79,7 +79,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Folder_viewOpenTicketFeedURL</string> </value>
+            <value> <string>string:${object_url}/Folder_viewOpenTicketFeedURLDialog</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Base_getActivePayableUserAmount.py

-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

-<?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_viewOpenTicketFeedURLDialog.xml

@@ -91,7 +91,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Folder_viewOpenTicketFeedURL</string> </value>
+            <value> <string>Folder_viewOpenTicketFeedURLDialog</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/InstanceTreeModule_viewResilienceUsageReport.xml

@@ -107,7 +107,6 @@
                     <value>
                       <list>
                         <string>your_resilient_percentage</string>
-                        <string>your_payable_active_users</string>
                       </list>
                     </value>
                 </item>

master/bt5/slapos_crm/TestTemplateItem/portal_components/test.erp5.testSlapOSCRMSkins.py

@@ -1614,7 +1614,9 @@ class TestSlapOSPerson_getSlapOSPendingTicketMessageTemplate(TestCRMSkinsMixin):
 
     title, message = person.Person_getSlapOSPendingTicketMessageTemplate()
     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):