odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20110917141600-hx1krluh69y7ngwe
This commit is contained in:
Fabien Pinckaers 2011-09-17 16:16:00 +02:00
parent 8e0cf09434 896fbf8f9c
commit f82898647b
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/survey/survey.py
View File

@ -92,7 +92,7 @@ class survey(osv.osv):
def survey_cancel(self, cr, uid, ids, arg):
self.write(cr, uid, ids, {'state': 'cancel' })
return True
def copy(self, cr, uid, ids, default=None, context=None):
vals = {}
current_rec = self.read(cr, uid, ids, context=context)
@ -181,9 +181,7 @@ class survey_page(osv.osv):
if context is None:
context = {}
data = super(survey_page, self).default_get(cr, uid, fields, context)
if context.get('line_order',False):
if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
self.pool.get('survey.question').data_get(cr,uid,data,context)
if context.has_key('survey_id'):
data['survey_id'] = context.get('survey_id', False)
return data
@ -504,14 +502,21 @@ class survey_question(osv.osv):
'context': context
}
def data_get(self, cr, uid, data, context):
if data and context:
if context.get('line_order',False) and data.get('sequence',0):
lines = context.get('line_order')
seq = data['sequence']
for line in lines:
seq = seq + 1
data.update({'sequence': str(seq)})
return data
def default_get(self, cr, uid, fields, context=None):
if context is None:
context = {}
data = super(survey_question, self).default_get(cr, uid, fields, context)
if context.get('line_order',False):
if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
self.data_get(cr,uid,data,context)
if context.has_key('page_id'):
data['page_id']= context.get('page_id', False)
return data
@ -604,9 +609,7 @@ class survey_answer(osv.osv):
if context is None:
context = {}
data = super(survey_answer, self).default_get(cr, uid, fields, context)
if context.get('line_order', False):
if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
self.pool.get('survey.question').data_get(cr,uid,data,context)
return data
survey_answer()

2
addons/survey/wizard/survey_selection.py
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, [])
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, [])):