Sanjay Gohel (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-914264-sgo into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Atul Patel(OpenERP) (atp-openerp)
Related bugs:
Bug #914264 in OpenERP Addons: "[PS][trunk] answer a survey"
https://bugs.launchpad.net/openobject-addons/+bug/914264
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-914264-sgo/+merge/88471
Hello,
I have change code and remove unused code and improve code as needed.
Kindly review it.
Thank You.
-SGO
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-914264-sgo/+merge/88471
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-914264-sgo.
=== modified file 'survey/wizard/survey_selection.py'
--- survey/wizard/survey_selection.py 2012-01-12 15:05:15 +0000
+++ survey/wizard/survey_selection.py 2012-01-13 10:00:35 +0000
@@ -22,12 +22,13 @@
from osv import osv
from osv import fields
from tools.translate import _
+from lxml import etree
class survey_name_wiz(osv.osv_memory):
_name = 'survey.name.wiz'
_columns = {
- 'survey_id': fields.many2one('survey', 'Survey', required=True, ondelete='cascade'),
+ 'survey_id': fields.many2one('survey', 'Survey', required=True, ondelete='cascade' ,domain= [('state', '=', 'open')]),
'page_no': fields.integer('Page Number'),
'note': fields.text("Description"),
'page': fields.char('Page Position',size = 12),
@@ -44,6 +45,22 @@
'store_ans': '{}' #Setting the default pattern as '{}' as the field is of type text. The field always gets the value in dict format
}
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+
+ survey_obj = self.pool.get('survey')
+ lines_ids = []
+ res = super(survey_name_wiz, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
+ if uid != 1:
+ lines_ids = survey_obj.search(cr, uid,[('invited_user_ids','in',uid)], context=context)
+ domain = '[("id", "in", '+ str(lines_ids)+')]'
+ doc = etree.XML(res['arch'])
+ nodes = doc.xpath("//field[@name='survey_id']")
+ for node in nodes:
+ node.set('domain',domain)
+ res['arch'] = etree.tostring(doc)
+ return res
+
+
def action_next(self, cr, uid, ids, context=None):
"""
Start the survey, Increment in started survey field but if set the max_response_limit of
@@ -87,5 +104,5 @@
return {}
notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note']
return {'value': {'note': notes}}
-
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'survey/wizard/survey_selection.xml'
--- survey/wizard/survey_selection.xml 2011-10-16 01:28:00 +0000
+++ survey/wizard/survey_selection.xml 2012-01-13 10:00:35 +0000
@@ -15,8 +15,7 @@
<separator colspan="4" string="Select Survey" />
<newline />
<field name="survey_id" colspan="4"
- on_change="on_change_survey(survey_id)" width="250"
- domain="[('state','=','open')]"/>
+ on_change="on_change_survey(survey_id)" width="250"/>
<group col="1" colspan="4"
attrs="{'readonly': [('survey_id','=',False)]}">
<separator colspan="4" string="Survey Details" />
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
