pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] survey: correctly cast selection fields to int, properly use a relation table for many2many fields.

Browse Source 
bzr revid: vmt@openerp.com-20110824093527-e8u4d410zof48vpm
This commit is contained in:
Vo Minh Thu
2011-08-24 11:35:27 +02:00
parent a3252963a5
commit b657bea06f
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/survey/wizard/survey_answer.py
+3 -2
View File
@@ -600,8 +600,9 @@ class survey_question_wiz(osv.osv_memory):
if not sur_name_read['store_ans']:
his_id = self.pool.get('survey.history').create(cr, uid, {'user_id': uid, \
'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': sur_name_read['survey_id']})
sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
survey_obj.write(cr, uid, sur_name_read['survey_id'], {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
survey_id = int(sur_name_read['survey_id']) # This is a selection field (a string).
sur_rec = survey_obj.read(cr, uid, survey_id)
survey_obj.write(cr, uid, survey_id, {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
if context.has_key('cur_id'):
if context.has_key('request') and context.get('request',False):
self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
addons/survey/wizard/survey_print.py
+1 -1
View File
@@ -27,7 +27,7 @@ from tools.translate import _
class survey_print(osv.osv_memory):
_name = 'survey.print'
_columns = {
'survey_ids': fields.many2many('survey','survey_print',\
'survey_ids': fields.many2many('survey','survey_print_survey_rel',\
'survey_id','print_id', "Survey", required="1"),
'orientation' : fields.selection([('vertical','Portrait(Vertical)'),\
('horizontal','Landscape(Horizontal)')], 'Orientation'),
addons/survey/wizard/survey_print_statistics.py
+1 -1
View File
@@ -26,7 +26,7 @@ from tools.translate import _
class survey_print_statistics(osv.osv_memory):
_name = 'survey.print.statistics'
_columns = {
'survey_ids': fields.many2many('survey','survey_print_statistics','survey_id',\
'survey_ids': fields.many2many('survey','survey_print_statistics_survey_rel','survey_id',\
'print_id', "Survey", required="1"),
}
addons/survey/wizard/survey_selection.py
+2 -2
View File
@@ -64,7 +64,7 @@ class survey_name_wiz(osv.osv_memory):
survey_user_group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / User')])
group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))])
user_obj = self.pool.get('res.users')
user_rec = user_obj.read(cr, uid, uid)
user_rec = user_obj.read(cr, uid, uid, ['groups_id', 'survey_id'], context)
if survey_user_group_id:
if survey_user_group_id == user_rec['groups_id']:
for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
@@ -123,7 +123,7 @@ class survey_name_wiz(osv.osv_memory):
if context is None: context = {}
this = self.browse(cr, uid, ids, context=context)[0]
survey_id = this.survey_id
survey_id = int(this.survey_id) # This is a selection field (a string).
context.update({'survey_id': survey_id, 'sur_name_id': this.id})
cr.execute('select count(id) from survey_history where user_id=%s\
and survey_id=%s' % (uid,survey_id))