openerp-dev-web team mailing list archive

["gpa\(Open ERP\)" <gpa@xxxxxxxxxxx>]

gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/usability_issue_fix into lp:~openobject-training/openobject-addons/training.

Requested reviews:
  Bhumika (OpenERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/usability_issue_fix/+merge/57636

Improvement for the wizard usability issue and icon improvement
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/usability_issue_fix/+merge/57636
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/usability_issue_fix.

=== modified file 'training/training_view.xml'
--- training/training_view.xml	2011-04-13 05:51:11 +0000
+++ training/training_view.xml	2011-04-14 09:13:28 +0000
@@ -314,7 +314,7 @@
                     </notebook>
                     <group colspan="4" col="6">
                         <field name="state_course" />
-                        <button string="Deprecate" icon="gtk-cancel" type="workflow" name="signal_deprecate" attrs="{'invisible' : [('state_course', '!=', 'validated')]}"
+                        <button string="Deprecate" icon="gtk-close" type="workflow" name="signal_deprecate" attrs="{'invisible' : [('state_course', '!=', 'validated')]}"
                             confirm="Do you want to deprecate this course ?" />
                         <button string="Validate" icon="terp-camera_test" type="workflow" name="signal_validate" attrs="{'invisible' : [('state_course', '!=', 'pending'),('state_course', '!=', 'draft')]}"
                             confirm="Do you want to validate this course ?" />

=== modified file 'training_degree/training_degree.py'
--- training_degree/training_degree.py	2011-04-07 13:04:11 +0000
+++ training_degree/training_degree.py	2011-04-14 09:13:28 +0000
@@ -420,7 +420,7 @@
                         dg_cache[dg_id] = [ c.id for c in dg_proxy.browse(cr, uid, dg_id, context=context).course_ids ]
                     if dc[obj.kind_search].id == obj[obj.kind_search].id:
                         if (dc_id, dg_id) not in degree_contacts:
-                            degree_contacts[(dc_id, dg_id)] = dict((c,False) for c in dg_cache[dg_id])
+                            degree_contacts[(dc_id, dg_id)] = dict((c,True) for c in dg_cache[dg_id])
                         if dc.participation_id.succeeded == 'yes':
                             degree_contacts[(dc_id, dg_id)][dc.course_id.id] = True
 

=== modified file 'training_degree/training_degree_view.xml'
--- training_degree/training_degree_view.xml	2011-04-04 05:11:29 +0000
+++ training_degree/training_degree_view.xml	2011-04-14 09:13:28 +0000
@@ -211,7 +211,7 @@
             <field name="model">training.degree.contact.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Label">
+                <form string="Label" >
                     <field name="kind_search" on_change="on_change_kind_search(kind_search)" />
                     <newline />
                     <field name="contact_id" attrs="{'readonly' : [('kind_search', '!=', 'contact_id')], 'required' : [('kind_search', '=', 'contact_id')]}" />
@@ -231,11 +231,11 @@
                         <button name="deselect_all_cb" type="object" string="Deselect All" icon="gtk-convert"/>
                     </group>
                     <separator colspan="4" />
-                    <group colspan="4" col="7">
+                    <group colspan="4" col="7"  width="800">
                         <field name="state" />
                         <button name="cancel_cb" special="cancel" type="object" string="Cancel" icon="gtk-cancel" />
                         <button name="show_degrees_cb" type="object" string="Show Degrees" icon="gtk-apply" />
-                        <button name="subscribe_cb" type="object" string="Subscribe to Degrees" states="show_degrees" icon="gtk-execute"/>
+                        <button name="subscribe_cb" type="object" string="Subscribe Degrees" states="show_degrees" icon="gtk-execute"/>
                         <button name="close_cb" type="object" string="Close" states="show_degrees" icon="gtk-close"/>
                     </group>
                 </form>
@@ -258,8 +258,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Training Degree Contact Report" col="4">
-                    <group attrs="{'readonly': [('state','!=','init')]}" colspan="4" col="2">
-                        <field name="degree_id"/>
+                    <group attrs="{'readonly': [('state','!=','init')]}" colspan="4" col="2" width="600">
+                        <field name="degree_id" />
                         <label string="(leave empty to choose all degrees)" colspan="2"/>
                     </group>
                     <group attrs="{'readonly' : [('state', '=', 'init')]}" colspan="4" col="2">

=== modified file 'training_exam/training_exam_view.xml'
--- training_exam/training_exam_view.xml	2011-04-06 07:06:20 +0000
+++ training_exam/training_exam_view.xml	2011-04-14 09:13:28 +0000
@@ -109,7 +109,7 @@
                         <field name="state"/>
                         <button type="action" name="%(training_exam.exam_question_new_version_action)d" string="Create New Version" icon="gtk-new" states="validated,deprecated"/>
                         <button type="action" name="%(training_exam_question_validate_wizard_action)d" string="Validate" icon="terp-camera_test" states="draft"/>
-                        <button type="action" name="%(wizard_question_deprecate_action)d" string="Deprecate" icon="gtk-cancel" states="validated"/>
+                        <button type="action" name="%(wizard_question_deprecate_action)d" string="Deprecate" icon="gtk-close" states="validated"/>
                     </group>
                 </form>
             </field>

=== modified file 'training_exam/wizard/training_exam_add_question.py'
--- training_exam/wizard/training_exam_add_question.py	2011-04-04 11:31:43 +0000
+++ training_exam/wizard/training_exam_add_question.py	2011-04-14 09:13:28 +0000
@@ -54,12 +54,13 @@
         if context is None:
             context = {}
         active_id = context.get('active_id', False)
-
-        questionnaire = self.pool.get('training.exam.questionnaire').browse(cr, uid, active_id, context=context)
-        if questionnaire.type == 'examen':
-            result = questionnaire.main_course_id.id
-        else:
-            result = len(questionnaire.course_ids) and questionnaire.course_ids[0].course_id.id or None
+        result = False
+        if context.get('active_model', False) == 'training.exam.questionnaire':
+            questionnaire = self.pool.get('training.exam.questionnaire').browse(cr, uid, active_id, context=context)
+            if questionnaire.type == 'examen':
+                result = questionnaire.main_course_id.id
+            else:
+                result = len(questionnaire.course_ids) and questionnaire.course_ids[0].course_id.id or None
         return result
 
     _defaults = {