Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
erp5
Commits
8e109faf
Commit
8e109faf
authored
Aug 25, 2011
by
Ivan Tyagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a new preference which can control if outgoing events (i.e. Mail
Messages) are to be stored inside CRM event_module.
parent
25fa2406
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
167 additions
and
5 deletions
+167
-5
bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference.xml
...plateItem/portal_property_sheets/CredentialPreference.xml
+1
-1
bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_store_events_property.xml
.../CredentialPreference/preferred_store_events_property.xml
+65
-0
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_sendPasswordResetLink.xml
...5_credential/CredentialRecovery_sendPasswordResetLink.xml
+2
-1
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_sendAcceptedNotification.xml
...credential/CredentialRequest_sendAcceptedNotification.xml
+1
-2
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml
...skins/erp5_credential/SystemPreference_viewCredential.xml
+1
-0
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_store_events.xml
...emPreference_viewCredential/my_preferred_store_events.xml
+96
-0
bt5/erp5_credential/bt/revision
bt5/erp5_credential/bt/revision
+1
-1
No files found.
bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference.xml
View file @
8e109faf
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
last_id
</string>
</key>
<key>
<string>
last_id
</string>
</key>
<value>
<string>
4
</string>
</value>
<value>
<string>
6
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
portal_type
</string>
</key>
<key>
<string>
portal_type
</string>
</key>
...
...
bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_store_events_property.xml
0 → 100644
View file @
8e109faf
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_local_properties
</string>
</key>
<value>
<tuple>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
mode
</string>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
string
</string>
</value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/boolean
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string>
If set will store all outgoing events (i.e. Mail Message) inside ERP5 CRM module.
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
preferred_store_events_property
</string>
</value>
</item>
<item>
<key>
<string>
mode
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
preference
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
property_default
</string>
</key>
<value>
<string>
python: True
</string>
</value>
</item>
<item>
<key>
<string>
write_permission
</string>
</key>
<value>
<string>
Manage properties
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_sendPasswordResetLink.xml
View file @
8e109faf
...
@@ -64,7 +64,8 @@ context.REQUEST.set(\'came_from\', context.getUrlString())\n
...
@@ -64,7 +64,8 @@ context.REQUEST.set(\'came_from\', context.getUrlString())\n
\n
\n
portal.portal_password.mailPasswordResetRequest(user_login=reference,\n
portal.portal_password.mailPasswordResetRequest(user_login=reference,\n
REQUEST=context.REQUEST,\n
REQUEST=context.REQUEST,\n
notification_message=notification_message)\n
notification_message=notification_message,\n
store_as_event=portal.portal_preferences.isPreferredStoreEvents())\n
</string>
</value>
</string>
</value>
</item>
</item>
<item>
<item>
...
...
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_sendAcceptedNotification.xml
View file @
8e109faf
...
@@ -58,7 +58,6 @@
...
@@ -58,7 +58,6 @@
portal = context.getPortalObject()\n
portal = context.getPortalObject()\n
recipient = context.getDestinationDecisionValue(portal_type="Person")\n
recipient = context.getDestinationDecisionValue(portal_type="Person")\n
\n
\n
\n
#Define the type of notification\n
#Define the type of notification\n
notification_type = "without-password"\n
notification_type = "without-password"\n
if password:\n
if password:\n
...
@@ -93,7 +92,7 @@ portal.portal_notifications.sendMessage(\n
...
@@ -93,7 +92,7 @@ portal.portal_notifications.sendMessage(\n
message=mail_text,\n
message=mail_text,\n
message_text_format=notification_message.getContentType(),\n
message_text_format=notification_message.getContentType(),\n
notifier_list=(portal.portal_preferences.getPreferredLoginAndPasswordNotifier(),),\n
notifier_list=(portal.portal_preferences.getPreferredLoginAndPasswordNotifier(),),\n
store_as_event=
True
,\n
store_as_event=
portal.portal_preferences.isPreferredStoreEvents()
,\n
event_keyword_argument_dict={\'follow_up\':context.getRelativeUrl()},\n
event_keyword_argument_dict={\'follow_up\':context.getRelativeUrl()},\n
)\n
)\n
</string>
</value>
</string>
</value>
...
...
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml
View file @
8e109faf
...
@@ -113,6 +113,7 @@
...
@@ -113,6 +113,7 @@
<string>
my_preferred_ask_credential_question
</string>
<string>
my_preferred_ask_credential_question
</string>
<string>
my_preferred_email_verification_check
</string>
<string>
my_preferred_email_verification_check
</string>
<string>
my_preferred_system_generate_password
</string>
<string>
my_preferred_system_generate_password
</string>
<string>
my_preferred_store_events
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_store_events.xml
0 → 100644
View file @
8e109faf
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_preferred_store_events
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_checkbox
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Store Outgoing Events
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_credential/bt/revision
View file @
8e109faf
389
390
\ No newline at end of file
\ No newline at end of file
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