Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5_fork
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eteri
erp5_fork
Commits
2e139aec
Commit
2e139aec
authored
Apr 01, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace deprecated text_format accessors by content_type
parent
fc1b9d74
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
11 deletions
+11
-11
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getPreferredResponseEventContentType.xml
...s/erp5_crm/Event_getPreferredResponseEventContentType.xml
+1
-1
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_setTextContentFromNotificationMessage.xml
.../erp5_crm/Event_setTextContentFromNotificationMessage.xml
+2
-2
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowRespondActionDialog/your_respond_event_text_content.xml
...owRespondActionDialog/your_respond_event_text_content.xml
+2
-2
bt5/erp5_crm/bt/revision
bt5/erp5_crm/bt/revision
+1
-1
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_viewEditor/my_text_content.xml
..._discussion/DiscussionPost_viewEditor/my_text_content.xml
+1
-1
bt5/erp5_discussion/bt/revision
bt5/erp5_discussion/bt/revision
+1
-1
bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_psj_crm/Event_viewFieldLibrary/my_text_content.xml
...s/erp5_psj_crm/Event_viewFieldLibrary/my_text_content.xml
+1
-1
bt5/erp5_registry_ohada/bt/revision
bt5/erp5_registry_ohada/bt/revision
+1
-1
product/ERP5/tests/testCRM.py
product/ERP5/tests/testCRM.py
+1
-1
No files found.
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getPreferredResponseEventContentType.xml
View file @
2e139aec
...
...
@@ -54,7 +54,7 @@
\n
This script is here so that we can easily customized depending on the context event, ticket or user preferences.\n
"""\n
return context.get
TextFormat
()\\\n
return context.get
ContentType
()\\\n
or context.getPortalObject().portal_preferences.getPreferredTextFormat()\n
</string>
</value>
</item>
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_setTextContentFromNotificationMessage.xml
View file @
2e139aec
...
...
@@ -68,9 +68,9 @@ substitution_method_parameter_dict.setdefault(\'event_value\', context)\n
\n
\n
if notification_message is not None:\n
context.set
TextFormat(notification_message.getTextFormat
())\n
context.set
ContentType(notification_message.getContentType
())\n
target_format = "txt"\n
if context.get
TextFormat
() == \'text/html\':\n
if context.get
ContentType
() == \'text/html\':\n
target_format = "html"\n
mime, text_content = notification_message.convert(target_format,\n
substitution_method_parameter_dict=substitution_method_parameter_dict)\n
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowRespondActionDialog/your_respond_event_text_content.xml
View file @
2e139aec
...
...
@@ -306,7 +306,7 @@
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python:(here.hasFile() or here.get
TextFormat
() == \'text/html\') and \'page\' or \'\'
</string>
</value>
<value>
<string>
python:(here.hasFile() or here.get
ContentType
() == \'text/html\') and \'page\' or \'\'
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
@@ -338,7 +338,7 @@
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python:(here.get
TextFormat
() == \'text/html\' and here.portal_preferences.getPreferredTextEditor()) or \'text_area\'
</string>
</value>
<value>
<string>
python:(here.get
ContentType
() == \'text/html\' and here.portal_preferences.getPreferredTextEditor()) or \'text_area\'
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
bt5/erp5_crm/bt/revision
View file @
2e139aec
695
\ No newline at end of file
696
\ No newline at end of file
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_viewEditor/my_text_content.xml
View file @
2e139aec
...
...
@@ -298,7 +298,7 @@
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python:(here.get
TextFormat
() == \'text/html\' and here.portal_preferences.getPreferredTextEditor()) or \'text_area\'
</string>
</value>
<value>
<string>
python:(here.get
ContentType
() == \'text/html\' and here.portal_preferences.getPreferredTextEditor()) or \'text_area\'
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
bt5/erp5_discussion/bt/revision
View file @
2e139aec
147
\ No newline at end of file
148
\ No newline at end of file
bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_psj_crm/Event_viewFieldLibrary/my_text_content.xml
View file @
2e139aec
...
...
@@ -364,7 +364,7 @@
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python:(here.get
TextFormat
() == \'text/html\' and here.portal_preferences.getPreferredTextEditor()) or \'text_area\'
</string>
</value>
<value>
<string>
python:(here.get
ContentType
() == \'text/html\' and here.portal_preferences.getPreferredTextEditor()) or \'text_area\'
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
bt5/erp5_registry_ohada/bt/revision
View file @
2e139aec
942
\ No newline at end of file
943
\ No newline at end of file
product/ERP5/tests/testCRM.py
View file @
2e139aec
...
...
@@ -515,7 +515,7 @@ class TestCRM(BaseTestCRM):
self
.
assertEqual
(
destination_list
,
[
first_user
])
mail_message
=
event_list
[
0
]
self
.
assertEqual
(
sender
.
getRelativeUrl
(),
mail_message
.
getSource
())
self
.
assertEqual
(
mail_message
.
get
TextFormat
(),
"text/html"
)
self
.
assertEqual
(
mail_message
.
get
ContentType
(),
"text/html"
)
self
.
assertEqual
(
mail_message
.
getTextContent
(),
"Hello %s"
%
first_user
.
getTitle
())
self
.
assertEqual
(
mail_message
.
getResourceValue
(),
service
)
...
...
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