# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1400075306 -7200
# Node ID 68861235109ec508bbea523e8caa8d8eba2d2595
# Parent  7ff2499089101c29bbc4624fd8d43d2d7e1a0bb7
Updated exceptions views

diff -r 7ff249908910 -r 68861235109e src/ztfy/myams/configure.zcml
--- a/src/ztfy/myams/configure.zcml	Wed May 14 15:48:09 2014 +0200
+++ b/src/ztfy/myams/configure.zcml	Wed May 14 15:48:26 2014 +0200
@@ -114,6 +114,20 @@
 		permission="zope.Public" />
 
 	<browser:page
+		name="index.html"
+		for="zope.security.interfaces.IUnauthorized"
+		class=".page.UnauthorizedExceptionView"
+		layer=".layer.MyAMSLayer"
+		permission="zope.Public" />
+
+	<browser:page
+		name="index.html"
+		for="zope.security.interfaces.IUnauthorized"
+		class=".page.UnauthorizedExceptionView"
+		layer="z3c.jsonrpc.interfaces.IJSONRPCRequest"
+		permission="zope.Public" />
+
+	<browser:page
 		name="error"
 		for="zope.security.interfaces.IUnauthorized"
 		class=".page.UnauthorizedExceptionView"
diff -r 7ff249908910 -r 68861235109e src/ztfy/myams/page.py
--- a/src/ztfy/myams/page.py	Wed May 14 15:48:09 2014 +0200
+++ b/src/ztfy/myams/page.py	Wed May 14 15:48:26 2014 +0200
@@ -8,13 +8,13 @@
 from datetime import datetime
 
 # import Zope3 interfaces
+from persistent.interfaces import IPersistent
 from z3c.json.interfaces import IJSONWriter
 from z3c.template.interfaces import ILayoutTemplate
 from zope.authentication.interfaces import IAuthentication
 from zope.pagetemplate.interfaces import IPageTemplate
 
 # import local interfaces
-from zope.traversing.browser.absoluteurl import absoluteURL
 from ztfy.myams.interfaces import IInnerPage, IModalPage
 
 # import Zope3 packages
@@ -23,11 +23,15 @@
 from zope.i18n import translate
 from zope.interface import implements
 from zope.publisher.browser import BrowserPage
+from zope.traversing.browser.absoluteurl import absoluteURL
 
 # import local packages
 from ztfy.utils.date import formatDatetime
 from ztfy.utils.text import textToHTML
 from ztfy.utils.timezone import tztime
+from ztfy.utils.traversing import getParent
+
+from ztfy.myams import _
 
 
 class BaseTemplateBasedPage(BrowserPage):
@@ -101,9 +105,12 @@
         return '%s (%s)' % (principal.title, principal.id)
 
     def __call__(self):
+        self.request.response.setStatus(500)
         writer = getUtility(IJSONWriter)
         return writer.write({'status': 'messagebox',
                              'messagebox': {'status': 'error',
+                                            'title': translate(_("An error occurred: %s"), context=self.request) %
+                                                     self.error_name,
                                             'content': self.error_message,
                                             'number': self.error_datetime,
                                             'icon': 'fa fa-warning animated shake'}})
@@ -116,6 +123,8 @@
         principal = self.request.principal
         auth = getUtility(IAuthentication)
         auth.unauthorized(principal.id, self.request)
+        self.request.response.setStatus(200)
+        parent = getParent(self.context, IPersistent)
         writer = getUtility(IJSONWriter)
         return writer.write({'status': 'modal',
-                             'location': 'login-dialog.html?came_from=%s' % absoluteURL(self.context, self.request)})
+                             'location': 'login-dialog.html?came_from=%s' % absoluteURL(parent, self.request)})