[FIX] fix ModelConverter.regex for realsies
authorXavier Morel <xmo@openerp.com>
Tue, 19 Nov 2013 11:32:05 +0000 (12:32 +0100)
committerXavier Morel <xmo@openerp.com>
Tue, 19 Nov 2013 11:32:05 +0000 (12:32 +0100)
bzr revid: xmo@openerp.com-20131119113205-osz07kc5t8xmf05f

addons/website/models/ir_http.py

index 3d196da..72fa455 100644 (file)
@@ -28,7 +28,7 @@ class ir_http(orm.AbstractModel):
 class ModelConverter(ir.ir_http.ModelConverter):
     def __init__(self, url_map, model=False):
         super(ModelConverter, self).__init__(url_map, model)
-        self.regex = r'(?:[A-Za-z0-9-_]+?-)?(\d+)'
+        self.regex = r'(?:[A-Za-z0-9-_]+?-)?(\d+)(?=$|/)'
 
     def to_url(self, value):
         if isinstance(value, orm.browse_record):