diff options
| author | Dharmraj Jhala (OpenERP) <dizzy.zala@gmail.com> | 2014-03-21 13:03:01 +0530 |
|---|---|---|
| committer | Dharmraj Jhala (OpenERP) <dizzy.zala@gmail.com> | 2014-03-21 13:03:01 +0530 |
| commit | 8bb5bfa241df9bcfa5a9bf3dbad4eaab59d54fec (patch) | |
| tree | b78959d4806327445b6b77181749be2301fe13dd /addons/website_mail_group | |
| parent | 9f51a6d45353f3a1c87a3a95eaf29476b61fd4a6 (diff) | |
| parent | 54d8cd1e866d1a6dc0b594588a6d900d6404728c (diff) | |
[MERGE] with latest trunk addons
bzr revid: dizzy.zala@gmail.com-20140320063836-xzno2dwuaxt1y033
bzr revid: dizzy.zala@gmail.com-20140321073301-hvfqqnch7jfktinb
Diffstat (limited to 'addons/website_mail_group')
| -rw-r--r-- | addons/website_mail_group/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_mail_group/views/website_mail_group.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py index a6f3adcd522..fe133434abc 100644 --- a/addons/website_mail_group/controllers/main.py +++ b/addons/website_mail_group/controllers/main.py @@ -59,7 +59,7 @@ class MailGroup(http.Controller): domain.append(('parent_id','=',False)) thread_count = thread_obj.search_count(cr, uid, domain, context=context) pager = request.website.pager( - url='/groups/%s/%s' % (group.id, mode), + url='/groups/%s/%s/' % (group.id, mode), total=thread_count, page=page, step=self._thread_per_page, diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml index 9e4b41329b4..fb18ee9f3fd 100644 --- a/addons/website_mail_group/views/website_mail_group.xml +++ b/addons/website_mail_group/views/website_mail_group.xml @@ -45,13 +45,13 @@ <t t-call="website.layout"> <section class="container"> <div class="row mt8"> - <div class="col-md-5"> - <ol class="breadcrumb mb8"> + <div class="col-md-5 mt16"> + <ol class="breadcrumb"> <li><a href="/groups">Mailing Lists</a></li> <li class="active" t-esc="group.name"/> </ol> </div> - <div class="col-md-5"> + <div class="col-md-5 pull-right"> <t t-call="website.pager"/> </div> </div> |