From a174342b0047b2cad5082e4b5bd1e5c3cb08fd5a Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Tue, 29 Oct 2013 17:20:34 +0100
Subject: [PATCH] [IMP] Admin views (WIP)

bzr revid: rim@openerp.com-20131029162034-1wihis6id6xm8glj
---
 addons/survey/survey.py       | 4 +++-
 addons/survey/survey_view.xml | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index bdeba8c27bc..220ddd226d8 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -351,7 +351,7 @@ class survey_question(osv.osv):
         'survey_id': fields.related('page_id', 'survey_id', type='many2one',
             relation='survey.survey', string='Survey', store=True),
         'parent_id': fields.many2one('survey.question', 'Parent question'),
-        'children_ids': fields.one2many('survey.question_id', 'parent_id',
+        'children_ids': fields.one2many('survey.question', 'parent_id',
             'Children questions'),
         'sequence': fields.integer('Sequence'),
 
@@ -598,6 +598,8 @@ class survey_suggestion(osv.osv):
     _rec_name = 'value'
 
     _columns = {
+        #'survey_id': fields.related('page_id', 'survey_id', type='many2one',
+        #    relation='survey.survey', string='Survey', store=True),
         'question_id': fields.many2one('survey.question', 'Question',
             required=True, ondelete='cascade'),
         'value': fields.char("Suggested value", length=128, translate=True,
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index fc9135a1f2a..9fc30495cff 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -395,7 +395,7 @@
             <field name="arch" type="xml">
                 <form string="Survey Question" version="7.0">
                     <sheet class="oe_survey">
-<!--                     <field name="in_visible_rating_weight" invisible="1"/>
+<!--                <field name="in_visible_rating_weight" invisible="1"/>
                     <field name="in_visible_menu_choice" invisible="1"/>
                     <field name="in_visible_answer_type" invisible="1"/>
  -->                    <group colspan="4" col="1">
@@ -409,7 +409,7 @@
                             <field name="question" nolabel="1" colspan="2"/>
                             <field name="description" nolabel="1" colspan="2"/>
                         </group>
-                        <group string="Answer" attrs="{'invisible':[('type','not in',['multiple_textboxes_diff_type', 'multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'rating_scale', 'multiple_textboxes', 'numerical_textboxes', 'date', 'date_and_time', 'table'])]}">
+                        <group string="Answer" attrs="{'invisible':[('type','not in',['matrix', 'multiple_textboxes_diff_type', 'multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'rating_scale', 'multiple_textboxes', 'numerical_textboxes', 'date', 'date_and_time', 'table'])]}">
                            <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
                                <field name="suggested_answers_ids" nolabel="1" colspan="4" /> <!-- context="{'in_visible_answer_type': in_visible_answer_type}"/> -->
                            </group>
@@ -422,6 +422,9 @@
  -->
                            </group>
                         </group>
+                        <group string="Children questions" attrs="{'invisible':[('type','not in',['matrix', 'vector'])]}">
+                            <field name='children_ids' nolabel='1' colspan='4' />
+                        </group>
                         <!--  <group string="Comment Field" attrs="{'invisible':[('type','not in',['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_choices_only_one_ans', 'rating_scale'])]}">
                             <group colspan="4">
                                 <field name="is_comment_require"/>
@@ -461,7 +464,7 @@
                             </group>
                         </group>
  -->
-                        <group string="Validation" attrs="{'invisible':[('type','not in',['single_textbox', 'multiple_textboxes'])]}">
+                        <group string="Validation" attrs="{'invisible':[('type','in',['matrix', 'vector'])]}">
                             <group colspan="4">
                                 <field name="validation_required"/>
                             </group>