[IMP] rename 'v' in 'context'

This commit is contained in:
Gery Debongnie 2014-07-17 09:57:43 +02:00
parent b28a710234
commit 242e28abf9

View File

@ -871,7 +871,7 @@ class RunbotController(http.Controller):
@http.route(['/runbot', '/runbot/repo/<model("runbot.repo"):repo>'], type='http', auth="public", website=True) @http.route(['/runbot', '/runbot/repo/<model("runbot.repo"):repo>'], type='http', auth="public", website=True)
def repo(self, repo=None, search='', limit='100', refresh='', **post): def repo(self, repo=None, search='', limit='100', refresh='', **post):
registry, cr, uid, context = request.registry, request.cr, 1, request.context registry, cr, uid = request.registry, request.cr, 1
branch_obj = registry['runbot.branch'] branch_obj = registry['runbot.branch']
build_obj = registry['runbot.build'] build_obj = registry['runbot.build']
icp = registry['ir.config_parameter'] icp = registry['ir.config_parameter']
@ -881,10 +881,10 @@ class RunbotController(http.Controller):
testing_total = build_obj.search_count(cr, uid, [('state','=','testing')]) testing_total = build_obj.search_count(cr, uid, [('state','=','testing')])
running_total = build_obj.search_count(cr, uid, [('state','=','running')]) running_total = build_obj.search_count(cr, uid, [('state','=','running')])
v = self.common(cr, uid) context = self.common(cr, uid)
# repo # repo
if not repo and v['repos']: if not repo and context['repos']:
repo = v['repos'][0] repo = context['repos'][0]
if repo: if repo:
# filters # filters
dom = [('repo_id','=',repo.id)] dom = [('repo_id','=',repo.id)]
@ -895,9 +895,9 @@ class RunbotController(http.Controller):
dom += [('state','!=',k)] dom += [('state','!=',k)]
if search: if search:
dom += [('dest','ilike',search)] dom += [('dest','ilike',search)]
v['filters'] = filters context['filters'] = filters
qu = QueryURL('/runbot/repo/'+slug(repo), search=search, limit=limit, refresh=refresh, **filters) qu = QueryURL('/runbot/repo/'+slug(repo), search=search, limit=limit, refresh=refresh, **filters)
v['qu'] = qu context['qu'] = qu
build_ids = build_obj.search(cr, uid, dom + [('branch_id.sticky','=',True)]) build_ids = build_obj.search(cr, uid, dom + [('branch_id.sticky','=',True)])
build_ids += build_obj.search(cr, uid, dom + [('branch_id.sticky','=',False)], limit=int(limit)) build_ids += build_obj.search(cr, uid, dom + [('branch_id.sticky','=',False)], limit=int(limit))
@ -913,19 +913,19 @@ class RunbotController(http.Controller):
if br[0] not in branch_ids: if br[0] not in branch_ids:
branch_ids.append(br[0]) branch_ids.append(br[0])
branches = branch_obj.browse(cr, uid, branch_ids, context=context) branches = branch_obj.browse(cr, uid, branch_ids, context=request.context)
v['branches'] = [] context['branches'] = []
for branch in branches: for branch in branches:
build_ids = build_obj.search(cr, uid, [('branch_id','=',branch.id)], limit=4) build_ids = build_obj.search(cr, uid, [('branch_id','=',branch.id)], limit=4)
branch.builds = build_obj.browse(cr, uid, build_ids, context=context) branch.builds = build_obj.browse(cr, uid, build_ids, context=request.context)
v['branches'].append(branch) context['branches'].append(branch)
# stats # stats
v['testing'] = build_obj.search_count(cr, uid, [('repo_id','=',repo.id), ('state','=','testing')]) context['testing'] = build_obj.search_count(cr, uid, [('repo_id','=',repo.id), ('state','=','testing')])
v['running'] = build_obj.search_count(cr, uid, [('repo_id','=',repo.id), ('state','=','running')]) context['running'] = build_obj.search_count(cr, uid, [('repo_id','=',repo.id), ('state','=','running')])
v['pending'] = build_obj.search_count(cr, uid, [('repo_id','=',repo.id), ('state','=','pending')]) context['pending'] = build_obj.search_count(cr, uid, [('repo_id','=',repo.id), ('state','=','pending')])
v.update({ context.update({
'search': search, 'search': search,
'limit': limit, 'limit': limit,
'refresh': refresh, 'refresh': refresh,
@ -936,7 +936,7 @@ class RunbotController(http.Controller):
'running_total': running_total, 'running_total': running_total,
'testing_total': testing_total, 'testing_total': testing_total,
}) })
return request.render("runbot.repo", v) return request.render("runbot.repo", context)
@http.route(['/runbot/build/<build_id>'], type='http', auth="public", website=True) @http.route(['/runbot/build/<build_id>'], type='http', auth="public", website=True)
def build(self, build_id=None, search=None, **post): def build(self, build_id=None, search=None, **post):