[IMP] improved code to add search functionality
bzr revid: tpa@tinyerp.com-20140225072356-v4sizgc1yn3mv3pl
This commit is contained in:
parent
d183eae422
commit
615d5c4ab8
|
@ -40,16 +40,21 @@ class website_forum(http.Controller):
|
|||
def questions(self, page=1, **searches):
|
||||
cr, uid, context = request.cr, request.uid, request.context
|
||||
forum_obj = request.registry['website.forum.post']
|
||||
tag_obj = request.registry['website.forum.tag']
|
||||
domain = [('parent_id', '=', False)]
|
||||
search = searches.get('search',False)
|
||||
if search:
|
||||
domain += ['|',
|
||||
('name', 'ilike', search),
|
||||
('content', 'ilike', search)]
|
||||
|
||||
step = 10
|
||||
question_count = forum_obj.search(
|
||||
request.cr, request.uid, [('parent_id', '=', False)], count=True,
|
||||
request.cr, request.uid, domain, count=True,
|
||||
context=request.context)
|
||||
pager = request.website.pager(url="/questions/", total=question_count, page=page, step=step, scope=10)
|
||||
|
||||
obj_ids = forum_obj.search(
|
||||
request.cr, request.uid, [('parent_id', '=', False)], limit=step,
|
||||
request.cr, request.uid, domain, limit=step,
|
||||
offset=pager['offset'], context=request.context)
|
||||
question_ids = forum_obj.browse(request.cr, request.uid, obj_ids,
|
||||
context=request.context)
|
||||
|
@ -76,6 +81,7 @@ class website_forum(http.Controller):
|
|||
'question': question,
|
||||
'main_object': question,
|
||||
'range': range,
|
||||
'searches': post
|
||||
}
|
||||
return request.website.render("website_forum.post_description_full", values)
|
||||
|
||||
|
|
|
@ -153,7 +153,7 @@
|
|||
<template id="post_search">
|
||||
<form class="navbar-form " role="search">
|
||||
<div class="form-group search-navbar">
|
||||
<input type="text" class="form-control" placeholder="Search Or Ask your Question" />
|
||||
<input type="text" class="form-control" name="search" placeholder="Search Or Ask your Question" t-att-value="searches.get('search') or ''"/>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-default AskButton">Ask Question</button>
|
||||
</form>
|
||||
|
@ -166,22 +166,28 @@
|
|||
<link rel='stylesheet' href='/website_blog/static/src/css/website_forum.css' />
|
||||
</t>
|
||||
<div id="wrap" class="js_blog">
|
||||
<t t-call="website_forum.post_search" />
|
||||
<div class="row">
|
||||
<form action="/questions/" method="get" class="pagination form-inline col-md-3">
|
||||
<t t-call="website_forum.post_search" />
|
||||
</form>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-3">
|
||||
<span itemprop="name" class="badge">
|
||||
<t t-esc="total_questions"/>
|
||||
Question
|
||||
<span class="badge">
|
||||
<t t-esc="total_questions"/> Question
|
||||
</span>
|
||||
</div>
|
||||
<t t-call="website_forum.shorting" />
|
||||
</div>
|
||||
<ul id="tabs" class="nav nav-pills">
|
||||
<li class="active">
|
||||
<a href="#all" data-toggle="tab">ALL</a>
|
||||
<a t-attf-href="#all" data-toggle="tab">ALL</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#unanswerd" data-toggle="tab">Unanswerd</a>
|
||||
<a t-attf-href="#unanswerd" data-toggle="tab">UNANSWERD</a>
|
||||
</li>
|
||||
<li>
|
||||
<a t-attf-href="#followed" data-toggle="tab">FOLLOWED</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="media-list">
|
||||
|
@ -298,7 +304,6 @@
|
|||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
<template id="post_description_full">
|
||||
<t t-call="website.layout">
|
||||
<t t-call="website_forum.post_search" />
|
||||
|
|
Loading…
Reference in New Issue