Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Jérome Perrin
erp5
Commits
9244433d
Commit
9244433d
authored
10 years ago
by
Jérome Perrin
Browse files
Options
Download
Email Patches
Plain Diff
CRM: Do not mark mails as read when viewed in the backoffice through fckeditor
parent
f6015d34
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_openEvent.xml
...SkinTemplateItem/portal_skins/erp5_crm/Base_openEvent.xml
+2
-1
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_readEvent.xml
...SkinTemplateItem/portal_skins/erp5_crm/Base_readEvent.xml
+2
-1
No files found.
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_openEvent.xml
View file @
9244433d
...
...
@@ -65,7 +65,8 @@ user = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
if user is None:\n
# If the referer contains the url of the event we are probably viewing the event\n
# from ERP5 interface. We do not want to mark the event as received in that case\n
if not (\'/event_module/%s\' % event_id) in request.HTTP_REFERER:\n
# It can also be from fckeditor, in this case we don\'t have the event url in REFERER.\n
if not ( (\'/event_module/%s\' % event_id) in request.HTTP_REFERER or \'fckeditor\' in request.HTTP_REFERER):\n
if portal.Base_getHMACHexdigest(portal.Base_getEventHMACKey(), event_id) != request["hash"]:\n
from zExceptions import Unauthorized\n
raise Unauthorized()\n
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_readEvent.xml
View file @
9244433d
...
...
@@ -65,7 +65,8 @@ user = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
if user is None:\n
# If the referer contains the url of the event we are probably viewing the event\n
# from ERP5 interface. We do not want to mark the event as delivered in that case\n
if not (\'/event_module/%s\' % event_id) in request.HTTP_REFERER:\n
# It can also be from fckeditor, in this case we don\'t have the event url in REFERER.\n
if not ( (\'/event_module/%s\' % event_id) in request.HTTP_REFERER or \'fckeditor\' in request.HTTP_REFERER):\n
if portal.Base_getHMACHexdigest(portal.Base_getEventHMACKey(), event_id) != request["hash"]:\n
from zExceptions import Unauthorized\n
raise Unauthorized()\n
...
...
This diff is collapsed.
Click to expand it.
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