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

[IMP] survey: 'response' to 'response_id'; view 'survey.question.wiz' inline

Browse Source 
bzr revid: chm@openerp.com-20130213145628-1zkvj02g963j5bff
This commit is contained in:
Christophe Matthieu
2013-02-13 15:56:28 +01:00
parent f71cbfcd3f
commit b144d73253
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/survey/survey.py
+6 -9
View File
@@ -157,6 +157,7 @@ class survey(osv.osv):
'view_mode': 'form',
'res_model': 'survey.question.wiz',
'type': 'ir.actions.act_window',
'target': 'inline',
'name': name,
'context': context
}
@@ -175,7 +176,7 @@ class survey(osv.osv):
'view_mode': 'form',
'res_model': 'survey.question.wiz',
'type': 'ir.actions.act_window',
'target': 'new',
'target': 'inline',
'name': name,
'context': context
}
@@ -210,10 +211,6 @@ class survey(osv.osv):
template_id = ir_model_data.get_object_reference(cr, uid, 'survey', 'email_template_survey')[1]
except ValueError:
template_id = False
try:
compose_form_id = ir_model_data.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')[1]
except ValueError:
compose_form_id = False
ctx = dict(context)
ctx.update({
@@ -228,9 +225,7 @@ class survey(osv.osv):
'type': 'ir.actions.act_window',
'view_type': 'form',
'view_mode': 'form',
'res_model': 'mail.compose.message',
'views': [(compose_form_id, 'form')],
'view_id': compose_form_id,
'res_model': 'survey.mail.compose.message',
'target': 'new',
'context': ctx,
}
@@ -766,12 +761,14 @@ class survey_request(osv.osv):
_name = "survey.request"
_order = 'date_deadline'
_rec_name = 'date_deadline'
_columns = {
'date_deadline': fields.date("Deadline date"),
'token': fields.char("Indentification token"),
'partner_id': fields.many2one("res.partner", "Partner"),
'email': fields.char("Email", size=64),
'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
'response': fields.many2one('survey.response', 'Answer'),
'response_id': fields.many2one('survey.response', 'Answer'),
'state': fields.selection([('draft','Draft'),('cancel', 'Cancelled'),('waiting_answer', 'Waiting Answer'),('done', 'Done')], 'Status', readonly=1)
}
_defaults = {
addons/survey/survey_view.xml
+6 -6
View File
@@ -1112,7 +1112,7 @@
<field name="survey_id"/>
<field name="partner_id" on_change="on_change_partner(partner_id)"/>
<field name="email"/>
<field name="response" readonly="1"/>
<field name="response_id" readonly="1"/>
</group>
</sheet>
</form>
@@ -1128,7 +1128,7 @@
<field name="partner_id"/>
<field name="email"/>
<field name="survey_id"/>
<field name="response" />
<field name="response_id" />
<field name="state" />
</tree>
</field>
@@ -1140,15 +1140,15 @@
<field name="arch" type="xml">
<search string="Search Survey">
<field name="email" string="Survey"/>
<filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
<separator/>
<filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
<filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
<separator/>
<filter string="My Survey(s)" icon="terp-personal" domain="[('partner_id','=',uid)]"/>
<filter string="My Survey(s)" icon="terp-personal" domain="[('partner_id.user_id.id','=',uid)]"/>
<field name="survey_id" widget="selection"/>
<field name="partner_id"/>
<group expand="0" string="Group By...">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
@@ -1161,7 +1161,7 @@
<field name="res_model">survey.request</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('partner_id','=',uid)]</field>
<field name="domain">['|', ('partner_id.user_id.id','=',uid), ('survey_id.responsible_id.id','=',uid)]</field>
<field name="view_id" ref="survey_request_tree"></field>
<field name="search_view_id" ref="survey_request_search"/>
</record>
addons/survey/wizard/survey_answer.py
+4 -4
View File
@@ -424,7 +424,7 @@ class survey_question_wiz(osv.osv_memory):
file.close()
os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
context.update({'response_id':response_id})
partner_email = user_obj.browse(cr, uid, uid, context).partner_email.email
partner_email = user_obj.browse(cr, uid, uid, context).email
resp_email = survey_data.responsible_id and survey_data.responsible_id.email or False
if partner_email and resp_email:
@@ -588,7 +588,7 @@ class survey_question_wiz(osv.osv_memory):
res_ans_obj = self.pool.get('survey.response.answer')
que_obj = self.pool.get('survey.question')
sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False), [])
partner_id = self.pool.get('res.users').browse(cr, uid, uid, context).partner_email.id
partner_id = self.pool.get('res.users').browse(cr, uid, uid, context).partner_id.id
response_id = 0
if not sur_name_read['response']:
@@ -1227,7 +1227,7 @@ class survey_question_wiz(osv.osv_memory):
"view_mode": 'form',
'res_model': 'survey.question.wiz',
'type': 'ir.actions.act_window',
'target': context.get('ir_actions_act_window_target', None),
'target': 'inline',
'search_view_id': search_id[0],
'context': context
}
@@ -1248,7 +1248,7 @@ class survey_question_wiz(osv.osv_memory):
"view_mode": 'form',
'res_model': 'survey.question.wiz',
'type': 'ir.actions.act_window',
'target': context.get('ir_actions_act_window_target', None),
'target': 'inline',
'search_view_id': search_id[0],
'context': context
}