From e66dcf25ec033e010af4cf460481a14a27deccbd Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 14 Feb 2011 17:27:07 +0530 Subject: [PATCH] [IMP] Survey,Board: USE BROWSE method insted of Read in OSV memory wiz bzr revid: aag@tinyerp.co.in-20110214115707-4l7bl0cfp595q6rc --- addons/board/wizard/board_menu_create.py | 8 +++----- addons/survey/wizard/survey_browse_answer.py | 17 +++++++---------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py index 73a8337bdb7..3c46c7e4092 100644 --- a/addons/board/wizard/board_menu_create.py +++ b/addons/board/wizard/board_menu_create.py @@ -70,12 +70,10 @@ class board_menu_create(osv.osv_memory): }) obj_menu = self.pool.get('ir.ui.menu') #start Loop - for data in self.read(cr, uid, ids, context=context): - if isinstance(data['menu_parent_id'], tuple): - data['menu_parent_id'] = data['menu_parent_id'][0] + for data in self.browse(cr, uid, ids, context=context): obj_menu.create(cr, uid, { - 'name': data.get('menu_name'), - 'parent_id': data.get('menu_parent_id'), + 'name': data.menu_name, + 'parent_id': data.menu_parent_id.id, 'icon': 'STOCK_SELECT_COLOR', 'action': 'ir.actions.act_window,' + str(action_id) }, context=context) diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py index 13ff39cc6be..6b1e3034974 100644 --- a/addons/survey/wizard/survey_browse_answer.py +++ b/addons/survey/wizard/survey_browse_answer.py @@ -61,16 +61,13 @@ class survey_browse_answer(osv.osv_memory): @return : Dictionary value for Open the browse answer wizard. """ if context is None: context = {} - record = self.read(cr, uid, ids, [],context=context) - record = record and record[0] or {} - if record['response_id']: - if isinstance(record['response_id'], tuple): - record['response_id'] = record['response_id'][0] - res_id = [(record['response_id'])] - else: - sur_response_obj = self.pool.get('survey.response') - res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))]) - context.update({'active' : True,'survey_id' : record['survey_id'], 'response_id' : res_id, 'response_no' : 0}) + sur_response_obj = self.pool.get('survey.response') + for record in self.browse(cr, uid, ids,context=context): + if record.response_id.id: + res_id = record.response_id.id + else: + res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',record.survey_id)])[0] + context.update({'active' : True,'survey_id' : record.survey_id, 'response_id' : [res_id], 'response_no' : 0}) search_obj = self.pool.get('ir.ui.view') search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')]) return {