Fix reset password process

install/requirements.txt

@@ -45,7 +45,7 @@ tw2.forms==2.2.2.1
 waitress==0.8.9
 zope.interface==4.1.3
 zope.sqlalchemy==0.7.6
-tgapp-resetpassword==0.1.3
+git+https://github.com/algoo/tgapp-resetpassword.git@master
 lxml
 python-ldap-test==0.2.0
 who-ldap==3.1.0

tracim/tracim/config/app_cfg.py

@@ -69,6 +69,7 @@ base_config['flash.template'] = '''
 # flash.js_call -> javascript code which will be run when displaying the flash from javascript. Default is webflash.render(), you can use webflash.payload() to retrieve the message and show it with your favourite library.
 # flash.js_template -> string.Template instance used to replace full javascript support for flash messages. When rendering flash message for javascript usage the following code will be used instead of providing the standard webflash object. If you replace js_template you must also ensure cookie parsing and delete it for already displayed messages. The template will receive: $container_id, $cookie_name, $js_call variables.
 
+base_config['templating.genshi.name_constant_patch'] = True
 
 # Configure the authentication backend
 

tracim/tracim/controllers/root.py

@@ -24,6 +24,7 @@ from tracim.controllers.error import ErrorController
 from tracim.controllers.help import HelpController
 from tracim.controllers.user import UserRestController
 from tracim.controllers.workspace import UserWorkspaceRestController
+from tracim.lib.utils import replace_reset_password_templates
 
 from tracim.model.data import ContentType
 from tracim.model.serializers import DictLikeClass
@@ -55,6 +56,10 @@ class RootController(StandardController):
     workspaces = UserWorkspaceRestController()
     user = UserRestController()
 
+    def _render_response(self, tgl, controller, response):
+        replace_reset_password_templates(controller.decoration.engines)
+        return super()._render_response(tgl, controller, response)
+
     def _before(self, *args, **kw):
         super(RootController, self)._before(args, kw)
         tmpl_context.project_name = "tracim"

tracim/tracim/lib/utils.py

@@ -17,4 +17,25 @@ def exec_time_monitor():
 
 
 class SameValueError(ValueError):
-    pass
+    pass
+
+
+def replace_reset_password_templates(engines):
+    try:
+        if engines['text/html'][1] == 'resetpassword.templates.index':
+            engines['text/html'] = (
+                'mako',
+                'tracim.templates.reset_password_index',
+                engines['text/html'][2],
+                engines['text/html'][3]
+            )
+
+        if engines['text/html'][1] == 'resetpassword.templates.change_password':
+            engines['text/html'] = (
+                'mako',
+                'tracim.templates.reset_password_change_password',
+                engines['text/html'][2],
+                engines['text/html'][3]
+            )
+    except IndexError:
+        pass