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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Sven Franck
erp5
Commits
9244433d
Commit
9244433d
authored
Mar 03, 2015
by
Jérome Perrin
Browse files
Options
Browse Files
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
...
@@ -65,7 +65,8 @@ user = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
if user is None:\n
if user is None:\n
# If the referer contains the url of the event we are probably viewing the event\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
# 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
if portal.Base_getHMACHexdigest(portal.Base_getEventHMACKey(), event_id) != request["hash"]:\n
from zExceptions import Unauthorized\n
from zExceptions import Unauthorized\n
raise Unauthorized()\n
raise Unauthorized()\n
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_readEvent.xml
View file @
9244433d
...
@@ -65,7 +65,8 @@ user = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
...
@@ -65,7 +65,8 @@ user = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
if user is None:\n
if user is None:\n
# If the referer contains the url of the event we are probably viewing the event\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
# 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
if portal.Base_getHMACHexdigest(portal.Base_getEventHMACKey(), event_id) != request["hash"]:\n
from zExceptions import Unauthorized\n
from zExceptions import Unauthorized\n
raise Unauthorized()\n
raise Unauthorized()\n
...
...
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