[MERGE] forward port branch saas-6 up to 9780551

2016-11-22 17:33:38 +01:00
parent 7196896e01 9780551bb7
commit c7b1712592
1 changed files with 4 additions and 4 deletions
@@ -553,12 +553,12 @@ class website(osv.osv):

    def search_pages(self, cr, uid, ids, needle=None, limit=None, context=None):
        name = re.sub(r"^/p(a(g(e(/(w(e(b(s(i(t(e(\.)?)?)?)?)?)?)?)?)?)?)?)?", "", needle or "")
+        name = slugify(name, max_length=50)
        res = []
        for page in self.enumerate_pages(cr, uid, ids, query_string=name, context=context):
-            if needle in page['loc']:
-                res.append(page)
-                if len(res) == limit:
-                    break
+            res.append(page)
+            if len(res) == limit:
+                break
        return res

    def image_url(self, cr, uid, record, field, size=None, context=None):