From f57cc2402d2df0b1512c3f8aeeb5ba01024436ba Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 23 Oct 2012 16:47:46 +0200 Subject: [PATCH] [IMP] survey: code review bzr revid: qdp-launchpad@openerp.com-20121023144746-aidxyhxho59irw2d --- addons/survey/survey.py | 6 ++---- addons/survey/survey_view.xml | 2 +- addons/survey/wizard/survey_answer.py | 4 ++-- addons/survey/wizard/survey_send_invitation.py | 15 ++++++++++----- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 809079eaedb..3b406484d43 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -152,8 +152,7 @@ class survey(osv.osv): pages = sur['page_ids'] if not pages: raise osv.except_osv(_('Warning!'), _('This survey has no question defined. Please define the questions and answers first.')) - else: - context.update({'active':False,'survey_id': ids[0]}) + context.update({'active':False,'survey_id': ids[0]}) return { 'view_type': 'form', 'view_mode': 'form', @@ -170,8 +169,7 @@ class survey(osv.osv): pages = sur['page_ids'] if not pages: raise osv.except_osv(_('Warning!'), _('This survey has no pages defined. Please define pages first.')) - else: - context.update({'active':True,'survey_id': ids[0]}) + context.update({'active':True,'survey_id': ids[0]}) return { 'view_type': 'form', 'view_mode': 'form', diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index ef3366ee1ee..c01e8b45ce2 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -215,7 +215,7 @@ - + diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py index 7e1417ecdb7..f1a96fa154a 100644 --- a/addons/survey/wizard/survey_answer.py +++ b/addons/survey/wizard/survey_answer.py @@ -153,9 +153,9 @@ class survey_question_wiz(osv.osv_memory): if pag_rec: title = pag_rec.title note = pag_rec.note - question_ids=pag_rec.question_ids + question_ids = pag_rec.question_ids else: - title=sur_rec.title + title = sur_rec.title xml_form = etree.Element('form', {'string': tools.ustr(title)}) if context.has_key('active') and context.get('active',False) and context.has_key('edit'): context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer}) diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py index 661c9417180..dd0d6157caf 100644 --- a/addons/survey/wizard/survey_send_invitation.py +++ b/addons/survey/wizard/survey_send_invitation.py @@ -67,14 +67,19 @@ class survey_send_invitation(osv.osv_memory): name += "\t --> " + sur.title + "\n" if sur.state != 'open': msg += sur.title + "\n" - data['mail_subject'] = "Invitation for " + sur.title - data['mail_subject_existing'] = "Invitation for " + sur.title + data['mail_subject'] = _("Invitation for %s") % (sur.title) + data['mail_subject_existing'] = "_(Invitation for %s") % (sur.title) data['mail_from'] = sur.responsible_id.email if msg: raise osv.except_osv(_('Warning!'), _('%sSurvey is not in open state') % msg) - data['mail'] = '''Hello %(name)s, \n\n We are inviting you for following survey. \ - \n ''' + name + '''\n Your login ID: %(login)s, Your password: %(passwd)s - \n '''+ self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context) + '''\n\n Thanks,''' + data['mail'] = _(''' +Hello %(name)s, \n\n +Please find hereby a survey that we would like you to fill: %s\n +You can access this survey with the following parameters: + Your login ID: %(login)s,\n + Your password: %(passwd)s\n +%s\n\n +Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)) return data def create_report(self, cr, uid, res_ids, report_name=False, file_name=False):