# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1234985536 -3600
# Node ID 8e06873d80d3f8a0fcfbc85ede13607601d86bfa
# Parent  83c7e0c467c9d672f3becc712ca8379441dd680e
rename error template to avoid conflicts with the error view

diff -r 83c7e0c467c9 -r 8e06873d80d3 web/application.py
--- a/web/application.py	Wed Feb 18 20:31:19 2009 +0100
+++ b/web/application.py	Wed Feb 18 20:32:16 2009 +0100
@@ -387,7 +387,7 @@
             errview = self.vreg.select_view('error', req, None)
             content = self.vreg.main_template(req, 'main-template', view=errview)
         except:
-            content = self.vreg.main_template(req, 'error')
+            content = self.vreg.main_template(req, 'error-template')
         raise StatusResponse(500, content)
     
     def need_login_content(self, req):
diff -r 83c7e0c467c9 -r 8e06873d80d3 web/views/basetemplates.py
--- a/web/views/basetemplates.py	Wed Feb 18 20:31:19 2009 +0100
+++ b/web/views/basetemplates.py	Wed Feb 18 20:32:16 2009 +0100
@@ -185,7 +185,7 @@
     main template. This template may be called for authentication error,
     which means that req.cnx and req.user may not be set.
     """
-    id = 'error'
+    id = 'error-template'
 
     def call(self):
         """display an unexpected error"""