openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06281
[Merge] lp:~openerp-dev/openobject-addons/training_usablity_web_client into lp:~openobject-training/openobject-addons/training
gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/training_usablity_web_client 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/training_usablity_web_client/+merge/59762
Fixed the Web client side Questionnarie problem and Improvement in the useablitiy
--
https://code.launchpad.net/~openerp-dev/openobject-addons/training_usablity_web_client/+merge/59762
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/training_usablity_web_client.
=== modified file 'training_degree/training_degree.py'
--- training_degree/training_degree.py 2011-04-14 09:07:28 +0000
+++ training_degree/training_degree.py 2011-05-03 12:05:32 +0000
@@ -386,9 +386,6 @@
'kind_search' : lambda *a: 'degree_id',
}
- def cancel_cb(self, cr, uid, ids, context=None):
- return {'type' : 'ir.actions.act_window_close'}
-
def on_change_kind_search(self, cr, uid, ids, kind_search, context=None):
key = {'contact_id' : 'degree_id', 'degree_id' : 'contact_id'}.get(kind_search, 'degree_id')
return { 'value' : { key : 0 }}
=== modified file 'training_degree/training_degree_view.xml'
--- training_degree/training_degree_view.xml 2011-05-02 13:26:02 +0000
+++ training_degree/training_degree_view.xml 2011-05-03 12:05:32 +0000
@@ -233,7 +233,11 @@
<separator colspan="4" />
<group colspan="4" col="7" width="800">
<field name="state" />
+<<<<<<< TREE
<button special="cancel" string="Cancel" icon="gtk-cancel" />
+=======
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+>>>>>>> MERGE-SOURCE
<button name="show_degrees_cb" type="object" string="Show Degrees" icon="gtk-apply" />
<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"/>
=== modified file 'training_degree/wizard/training_validate_degree.xml'
--- training_degree/wizard/training_validate_degree.xml 2011-03-28 13:38:58 +0000
+++ training_degree/wizard/training_validate_degree.xml 2011-05-03 12:05:32 +0000
@@ -11,7 +11,7 @@
<newline/>
<separator colspan="4"/>
<group colspan="2" col="2">
- <button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="validate_all_degrees" string="Validate Assigned Degrees" icon="gtk-apply"/>
</group>
</form>
=== modified file 'training_diagnostic/view/training.xml'
--- training_diagnostic/view/training.xml 2011-03-28 10:02:05 +0000
+++ training_diagnostic/view/training.xml 2011-05-03 12:05:32 +0000
@@ -66,18 +66,6 @@
</field>
</record>
- <record model="ir.ui.view" id="training_exam_questionnaire_for_diagnostic_tree">
- <field name="name">training.exam.questionnaire.for.diagnostic.tree</field>
- <field name="model">training.exam.questionnaire</field>
- <field name="type">form</field>
- <field name="inherit_id" ref="training_exam.exam_questionnaire_tree"/>
- <field name="arch" type="xml">
- <field name="kind" position="after">
- <field name="type"/>
- </field>
- </field>
- </record>
-
<record model="ir.ui.view" id="training_exam_question_for_diagnostic">
<field name="name">training.exam.question.for.diagnostic</field>
<field name="model">training.exam.question</field>
@@ -120,7 +108,7 @@
<page string="Summary" position="replace">
<page string="Diagnostic / Summary" groups="base.group_user">
<group colspan="2" col="2" expand="1">
- <field name="interview_date"/>
+ <field name="interview_date"/>
<separator string="Summary" colspan="2"/>
<field name="summary" nolabel="1" colspan="2"/>
</group>
@@ -155,9 +143,9 @@
<page string="Exam Participation" position="attributes">
<attribute name="attrs">{'invisible': [('kind', 'not in', ['exam', 'diagnostic'])]}</attribute>
</page>
- <page string="Exam Summary" position="attributes">
- <attribute name="attrs">{'invisible': [('kind', 'not in', ['exam', 'diagnostic'])]}</attribute>
- </page>
+ <page string="Exam Summary" position="attributes">
+ <attribute name="attrs">{'invisible': [('kind', 'not in', ['exam', 'diagnostic'])]}</attribute>
+ </page>
</data>
</field>
</record>
=== modified file 'training_evaluation/wizard/wizard_organization_report_view.xml'
--- training_evaluation/wizard/wizard_organization_report_view.xml 2011-04-11 06:22:19 +0000
+++ training_evaluation/wizard/wizard_organization_report_view.xml 2011-05-03 12:05:32 +0000
@@ -7,11 +7,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Origanization Report" col="2">
-
<field name="partner_id"/>
<separator colspan="4"/>
<group colspan="4">
- <button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="do_print" type="object" string="Print" colspan="2" icon="gtk-print"/>
</group>
</form>
=== modified file 'training_evaluation/wizard/wizard_preview_evaluation_view.xml'
--- training_evaluation/wizard/wizard_preview_evaluation_view.xml 2011-04-27 06:24:28 +0000
+++ training_evaluation/wizard/wizard_preview_evaluation_view.xml 2011-05-03 12:05:32 +0000
@@ -12,7 +12,7 @@
<separator colspan="4"/>
<group colspan="4">
<label colspan="2"/>
- <button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="button_print" string="Print" icon="gtk-print"/>
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_add_question.py'
--- training_exam/wizard/training_exam_add_question.py 2011-04-13 12:29:18 +0000
+++ training_exam/wizard/training_exam_add_question.py 2011-05-03 12:05:32 +0000
@@ -68,9 +68,6 @@
'course_id' : _default_course_id,
}
- def cancel_cb(self, cr, uid, ids, context=None):
- return {'type' : 'ir.actions.act_window_close'}
-
def add_questions_cb(self, cr, uid, ids, context=None):
if not ids:
return False
=== modified file 'training_exam/wizard/training_exam_add_question_view.xml'
--- training_exam/wizard/training_exam_add_question_view.xml 2011-05-02 13:26:02 +0000
+++ training_exam/wizard/training_exam_add_question_view.xml 2011-05-03 12:05:32 +0000
@@ -16,7 +16,11 @@
<separator colspan="4" string=""/>
<group colspan="4">
<label colspan="2"/>
+<<<<<<< TREE
<button string="Cancel" special="cancel" type="object" icon="gtk-cancel"/>
+=======
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+>>>>>>> MERGE-SOURCE
<button name="add_questions_cb" string="Add Questions" type="object" icon="terp-document-new"/>
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_depricate_question_view.xml'
--- training_exam/wizard/training_exam_depricate_question_view.xml 2011-03-22 09:08:32 +0000
+++ training_exam/wizard/training_exam_depricate_question_view.xml 2011-05-03 12:05:32 +0000
@@ -13,7 +13,7 @@
<separator colspan="4"/>
<group colspan="4">
<label colspan="2"/>
- <button type="special" special="cancel" string="Cancel" colspan="1" icon="gtk-cancel"/>
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="button_deprecate" string="Deprecate" colspan="1" icon="gtk-execute"/>
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_print_questionnaire_raw_view.xml'
--- training_exam/wizard/training_exam_print_questionnaire_raw_view.xml 2011-03-22 09:08:32 +0000
+++ training_exam/wizard/training_exam_print_questionnaire_raw_view.xml 2011-05-03 12:05:32 +0000
@@ -13,7 +13,7 @@
<separator colspan="4"/>
<group colspan="4">
<label colspan="2"/>
- <button type="special" special="cancel" string="Cancel" colspan="1" icon="gtk-cancel"/>
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="button_create_report" colspan="1" string="Create Report" icon='gtk-print' type="object"/>
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_question.py'
--- training_exam/wizard/training_exam_question.py 2011-03-15 10:34:06 +0000
+++ training_exam/wizard/training_exam_question.py 2011-05-03 12:05:32 +0000
@@ -33,8 +33,6 @@
'course_id' : fields.many2one('training.course', 'Course', required=True, domain="[('state_course', '=', 'validated')]"),
}
- def action_cancel(self, cr, uid, ids, context=None):
- return {'type':'ir.actions.act_window_close'}
def find_question_with_course(self, cr, uid, ids, context=None):
if not ids:
=== modified file 'training_exam/wizard/training_exam_question_assign_course_view.xml'
--- training_exam/wizard/training_exam_question_assign_course_view.xml 2011-03-22 09:08:32 +0000
+++ training_exam/wizard/training_exam_question_assign_course_view.xml 2011-05-03 12:05:32 +0000
@@ -12,7 +12,7 @@
<separator colspan="4"/>
<group colspan="4">
<label colspan="2"/>
- <button type="special" special="cancel" string="Cancel" colspan="1" icon="gtk-cancel"/>
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="action_confirm" string="Confirm" colspan="1" icon="gtk-apply"/>
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_question_create_new_version_view.xml'
--- training_exam/wizard/training_exam_question_create_new_version_view.xml 2011-03-22 09:08:32 +0000
+++ training_exam/wizard/training_exam_question_create_new_version_view.xml 2011-05-03 12:05:32 +0000
@@ -1,7 +1,6 @@
<openerp>
<data>
-
<record model="ir.ui.view" id="exam_question_new_version_form">
<field name="name">training.exam.question.new.version.wizard.form</field>
<field name="model">training.exam.question.new.version.wizard</field>
@@ -14,7 +13,7 @@
<separator colspan="4"/>
<group colspan="4">
<label colspan="2"/>
- <button type="special" icon="gtk-cancel" special="cancel" string="Cancel"/>
+ <button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button type="object" icon="terp-document-new" name="action_create_new_version" string="Create"/>
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_question_validate_view.xml'
--- training_exam/wizard/training_exam_question_validate_view.xml 2011-03-25 13:14:43 +0000
+++ training_exam/wizard/training_exam_question_validate_view.xml 2011-05-03 12:05:32 +0000
@@ -13,7 +13,7 @@
<separator colspan="4"/>
<group colspan="2" col="6">
<field name="state" invisible="1"/>
- <button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button type="object" icon="gtk-ok" name="action_validate_wo_qz" string="Validate (without Quizz)"/>
<button type="object" icon="gtk-ok" name="action_validate_w_qz" string="Validate (with Quizz)"/>
</group>
=== modified file 'training_exam/wizard/training_exam_question_view.xml'
--- training_exam/wizard/training_exam_question_view.xml 2011-05-02 13:26:02 +0000
+++ training_exam/wizard/training_exam_question_view.xml 2011-05-03 12:05:32 +0000
@@ -13,7 +13,11 @@
<separator colspan="4"/>
<group colspan="4">
<label colspan="2"/>
+<<<<<<< TREE
<button string="_Cancel" icon="gtk-cancel" special="cancel" />
+=======
+ <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+>>>>>>> MERGE-SOURCE
<button name="find_question_with_course" string="_Apply" icon="gtk-apply" type="object" />
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_questionnaire_create_new_version_view.xml'
--- training_exam/wizard/training_exam_questionnaire_create_new_version_view.xml 2011-03-22 09:08:32 +0000
+++ training_exam/wizard/training_exam_questionnaire_create_new_version_view.xml 2011-05-03 12:05:32 +0000
@@ -13,7 +13,7 @@
<separator colspan="4"/>
<group colspan="4">
<label colspan="2"/>
- <button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button type="object" name="action_create_new_version" string="Create" icon="terp-document-new"/>
</group>
</form>
=== modified file 'training_exam/wizard/training_exam_validate_question_view.xml'
--- training_exam/wizard/training_exam_validate_question_view.xml 2011-03-22 09:08:32 +0000
+++ training_exam/wizard/training_exam_validate_question_view.xml 2011-05-03 12:05:32 +0000
@@ -12,7 +12,7 @@
<separator colspan="4"/>
<group colspan="4">
<label colspan="2"/>
- <button type="special" special="cancel" string="Cancel" colspan="1" icon="gtk-cancel"/>
+ <button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button type="object" name="button_validate" string="Validate" colspan="1" icon="gtk-ok"/>
</group>
</form>
Follow ups
