openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #04456
lp:~openerp-dev/openobject-addons/addons-training-improve-code-ysa into lp:~openobject-training/openobject-addons/training_with_history
Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-improve-code-ysa into lp:~openobject-training/openobject-addons/training_with_history.
Requested reviews:
OpenObject Training (openobject-training)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-improve-code-ysa/+merge/54309
improve code in training,training_exam, training_room, training_intra module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-improve-code-ysa/+merge/54309
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-improve-code-ysa.
=== modified file 'training/training.py'
--- training/training.py 2011-03-21 12:26:03 +0000
+++ training/training.py 2011-03-22 08:55:07 +0000
@@ -547,7 +547,7 @@
if context is None:
context = {}
link_id = context.get('link_id', False)
- has_master_course = context and ('master_course' in context) or False
+ has_master_course = 'master_course' in context or False
if link_id:
course = self.browse(cr, uid, link_id, context=context)
@@ -561,7 +561,7 @@
if has_master_course:
return list(set(super(training_course, self).search(cr, uid, [('reference_id', '!=', False)], context=context)))
- offer_id = context and context.get('offer_id', False) or False
+ offer_id = context.get('offer_id', False)
if offer_id:
proxy = self.pool.get('training.course.offer.rel')
@@ -1012,7 +1012,7 @@
cr.execute("""SELECT offer_id FROM training_course_offer_rel WHERE course_id = %s""", (course_id,))
return [x[0] for x in cr.fetchall()]
- offer_id = context and context.get('offer_id', False) or False
+ offer_id = context.get('offer_id', False)
if offer_id:
cr.execute("""SELECT course_id FROM training_course_offer_rel WHERE offer_id = %s""", (offer_id,))
@@ -1126,7 +1126,7 @@
fp.write(result)
fp.close()
- active_id = context and context.get('active_id')
+ active_id = context.get('active_id', False)
seance = self.pool.get('training.seance').browse(cr, uid, active_id, context=context)
ts = time.strptime(seance.date, '%Y-%m-%d %H:%M:%S')
date = time.strftime('%Y%m%d', ts)
@@ -1152,7 +1152,7 @@
def add_selections(self, cr, uid, ids, directory, log, context=None):
if context is None:
context = {}
- active_id = context and context.get('active_id')
+ active_id = context.get('active_id', False)
seance = self.pool.get('training.seance').browse(cr, uid, active_id, context=context)
ts = time.strptime(seance.date, '%Y-%m-%d %H:%M:%S')
date = time.strftime('%Y%m%d', ts)
@@ -1907,7 +1907,7 @@
def search(self, cr, uid, domain, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
- subscription_id = context and context.get('subscription_id', False) or False
+ subscription_id = context.get('subscription_id', False)
if subscription_id:
proxy = self.pool.get('training.subscription.line')
ids = proxy.search(cr, uid, [('subscription_id', '=', subscription_id)], context=context)
@@ -1930,8 +1930,8 @@
def action_apply(self, cr, uid, ids, context=None):
if context is None:
context = {}
- subscription_form_view = context and context.get('subscription_form_view', False) or False
- record_id = context and context.get('record_id', False) or False
+ subscription_form_view = context.get('subscription_form_view', False)
+ record_id = context.get('record_id', False)
this = self.browse(cr, uid, ids)[0]
@@ -2725,10 +2725,10 @@
def search(self, cr, uid, domain, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
- offer_id = context and context.get('offer_id', False) or False
+ offer_id = context.get('offer_id', False)
if offer_id:
- date = context and context.get('date', False) or False
+ date = context.get('date', False)
if not date:
date = time.strftime('%Y-%m-%d')
cr.execute("SELECT seance.id AS seance_id, rel.offer_id, seance.course_id, seance.name, seance.state, seance.date "
@@ -2742,8 +2742,8 @@
return [x[0] for x in cr.fetchall()]
- job_id = context and context.get('job_id', False) or False
- request_session_id = context and context.get('request_session_id', False) or False
+ job_id = context.get('job_id', False)
+ request_session_id = context.get('request_session_id', False)
if job_id and request_session_id:
session = self.pool.get('training.session').browse(cr, uid, request_session_id, context=context)
@@ -3718,7 +3718,7 @@
'account_id' : session.offer_id.product_id.property_account_income and session.offer_id.product_id.property_account_income.id or account_id,
'origin' : sl.name,
'price_unit' : sl.price,
- 'discount' : context and context.get('discount', 0.0) or 0.0,
+ 'discount' : context.get('discount', 0.0),
'invoice_line_tax_id': self._get_invoice_line_taxes(cr, uid, sl, fpos, partner, session, context=context),
'account_analytic_id': '',
'analytics_id': '', # Analytic Distribution
@@ -4492,7 +4492,7 @@
def default_get(self, cr, uid, fields, context=None):
if context is None:
context = {}
- record_id = context and context.get('record_id', False) or False
+ record_id = context.get('record_id', False)
res = super(training_session_duplicate_wizard, self).default_get(cr, uid, fields, context=context)
=== modified file 'training/wizard/training_create_block_offer.xml'
--- training/wizard/training_create_block_offer.xml 2011-03-21 12:26:03 +0000
+++ training/wizard/training_create_block_offer.xml 2011-03-22 08:55:07 +0000
@@ -7,15 +7,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Offer Description">
- <group colspan="2" col="2">
- <field name="name" />
- <field name="type_id" />
- <field name="lang_id" />
- <field name="product_line_id" />
+ <group colspan="4" col="2">
+ <field name="name"/>
+ <field name="type_id"/>
+ <field name="lang_id"/>
+ <field name="product_line_id"/>
</group>
<newline/>
- <separator colspan="4" string=""/>
- <group colspan="2" col="2">
+ <separator colspan="4"/>
+ <group colspan="4">
+ <label colspan="2"/>
<button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="create_block_offer" string="Create Offers" icon="gtk-new"/>
</group>
=== modified file 'training/wizard/training_create_offer.xml'
--- training/wizard/training_create_offer.xml 2011-03-21 12:26:03 +0000
+++ training/wizard/training_create_offer.xml 2011-03-22 08:55:07 +0000
@@ -9,8 +9,9 @@
<form string="Create Offers">
<label string="Do you want to create an offer for each selected course ?" />
<newline/>
- <separator colspan="4" string=""/>
- <group colspan="2" col="2">
+ <separator colspan="4"/>
+ <group colspan="4">
+ <label colspan="2"/>
<button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="create_offers" string="Create Offers" icon="gtk-new"/>
</group>
=== modified file 'training/wizard/training_subscription_line_confirm.xml'
--- training/wizard/training_subscription_line_confirm.xml 2011-03-21 12:26:03 +0000
+++ training/wizard/training_subscription_line_confirm.xml 2011-03-22 08:55:07 +0000
@@ -9,8 +9,9 @@
<form string="Confirm Subscription Lines">
<label string="Do you want to confirm all subscription lines ?" />
<newline/>
- <separator colspan="4" string=""/>
- <group colspan="2" col="2">
+ <separator colspan="4"/>
+ <group colspan="4">
+ <label colspan="2"/>
<button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="confirm_line" string="Confirm" icon="gtk-apply"/>
</group>
=== modified file 'training/wizard/training_subscription_second_line.xml'
--- training/wizard/training_subscription_second_line.xml 2011-03-21 12:26:03 +0000
+++ training/wizard/training_subscription_second_line.xml 2011-03-22 08:55:07 +0000
@@ -9,8 +9,9 @@
<form string="Mass Subscription Second Line">
<label string="This wizard will generate the subscription !" />
<newline/>
- <separator colspan="4" string=""/>
- <group colspan="2" col="2">
+ <separator colspan="4"/>
+ <group colspan="4">
+ <label colspan="2"/>
<button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="make_subscription" string="Make Subscription" icon="gtk-apply"/>
</group>
=== modified file 'training/wizard/training_subscription_session.xml'
--- training/wizard/training_subscription_session.xml 2011-03-21 12:26:03 +0000
+++ training/wizard/training_subscription_session.xml 2011-03-22 08:55:07 +0000
@@ -15,7 +15,8 @@
<field name="line_ids" nolabel="1" colspan="4" domain="[('state', 'in', ('opened','opened_confirmed'))]"/>
<newline/>
<separator colspan="4" string=""/>
- <group colspan="2" col="2">
+ <group colspan="4">
+ <label colspan="2"/>
<button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="make_subscription" string="Create Subscription" icon="gtk-new"/>
</group>
=== modified file 'training/wizard/validate_course_view.xml'
--- training/wizard/validate_course_view.xml 2011-03-21 12:26:03 +0000
+++ training/wizard/validate_course_view.xml 2011-03-22 08:55:07 +0000
@@ -9,8 +9,9 @@
<form string="Validate Courses">
<label string="Do you want to validate the selected courses ?" />
<newline/>
- <separator colspan="4" string=""/>
- <group colspan="2" col="2">
+ <separator colspan="4"/>
+ <group colspan="4">
+ <label colspan="2"/>
<button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="validate_courses" string="Validate Courses" icon="gtk-apply"/>
</group>
=== modified file 'training/wizard/wizard_create_session.py'
--- training/wizard/wizard_create_session.py 2010-10-08 09:36:11 +0000
+++ training/wizard/wizard_create_session.py 2011-03-22 08:55:07 +0000
@@ -51,8 +51,10 @@
}
def _get_new_session_data(self, cr, uid, wizard, context=None):
+ if context is None:
+ context = {}
session_proxy = self.pool.get('training.session')
- active_id = context and context.get('active_id') or None
+ active_id = context.get('active_id') or None
vals = session_proxy.on_change_offer(cr, uid, None, active_id)
if isinstance(vals, dict):
# we have specified a custom name on session creation,
=== modified file 'training/wizard/wizard_create_session_view.xml'
--- training/wizard/wizard_create_session_view.xml 2011-03-21 12:26:03 +0000
+++ training/wizard/wizard_create_session_view.xml 2011-03-22 08:55:07 +0000
@@ -13,8 +13,9 @@
<newline/>
<field name="date"/>
<newline/>
- <separator colspan="4" string=""/>
- <group colspan="2" col="2">
+ <separator colspan="4"/>
+ <group colspan="4">
+ <label colspan="2"/>
<button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="create_session" string="Create Session" icon="gtk-apply"/>
</group>
=== modified file 'training_exam/training_exam.py'
--- training_exam/training_exam.py 2011-03-15 13:00:49 +0000
+++ training_exam/training_exam.py 2011-03-22 08:55:07 +0000
@@ -138,7 +138,7 @@
def search(self, cr, uid, domain, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
- request_session_id = context and context.get('request_session_id', False) or False
+ request_session_id = context.get('request_session_id', False)
if request_session_id:
session = self.pool.get('training.session').browse(cr, uid, request_session_id, context=context)
if session.kind == 'exam':
@@ -487,9 +487,9 @@
def search(self, cr, uid, domain, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
- course_id = context and context.get('course_id', False) or False
- kind = context and context.get('kind', False) or False
- without_course = context and context.get('course', False) or False
+ course_id = context.get('course_id', False)
+ kind = context.get('kind', False)
+ without_course = context.get('course', False)
if without_course:
cr.execute("SELECT id "
@@ -516,7 +516,7 @@
return [x[0] for x in cr.fetchall()]
- questionnaire_id = context and context.get('questionnaire_id', False) or False
+ questionnaire_id = context.get('questionnaire_id', False)
if questionnaire_id:
course_id = self.pool.get('training.exam.questionnaire').browse(cr, uid, questionnaire_id).course_id.id
@@ -1168,7 +1168,7 @@
'account_id' : session.offer_id.product_id.property_account_income and session.offer_id.product_id.property_account_income.id or account_id,
'origin' : sl.name,
'price_unit' : sl.price,
- 'discount' : context and context.get('discount', 0.0) or 0.0,
+ 'discount' : context.get('discount', 0.0),
'invoice_line_tax_id': self._get_invoice_line_taxes(cr, uid, sl, fpos, partner, session, context=context),
'account_analytic_id': '',
'analytics_id': '', # Analytic Distribution
=== modified file 'training_exam/wizard/training_exam_add_question.py'
--- training_exam/wizard/training_exam_add_question.py 2011-03-15 13:00:49 +0000
+++ training_exam/wizard/training_exam_add_question.py 2011-03-22 08:55:07 +0000
@@ -38,12 +38,12 @@
def _default_questionnaire_id(self, cr, uid, context=None):
if context is None:
context = {}
- return context and context.get('active_id', False) or False
+ return context.get('active_id', False)
def _default_course_id(self, cr, uid, context=None):
if context is None:
context = {}
- active_id = context and context.get('active_id', False) or False
+ 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':
=== modified file 'training_exam/wizard/training_exam_depricate_question.py'
--- training_exam/wizard/training_exam_depricate_question.py 2011-03-15 10:34:06 +0000
+++ training_exam/wizard/training_exam_depricate_question.py 2011-03-22 08:55:07 +0000
@@ -18,9 +18,9 @@
if context is None:
context = {}
question_pool = self.pool.get('training.exam.question')
- if context and 'active_ids' in context:
+ if context.get('active_ids',[]):
wizard = self.browse(cr, uid, ids[0], context=context)
- question_ids = context.get('active_ids')
+ question_ids = context.get('active_ids', [])
validated_question_ids = question_pool.search(cr, uid, [('state','in',['validated','draft']),('id','in',question_ids)], context=context)
if wizard.note:
=== modified file 'training_exam/wizard/training_exam_validate_question.py'
--- training_exam/wizard/training_exam_validate_question.py 2011-03-15 10:34:06 +0000
+++ training_exam/wizard/training_exam_validate_question.py 2011-03-22 08:55:07 +0000
@@ -32,8 +32,8 @@
if context is None:
context = {}
question_pool = self.pool.get('training.exam.question')
- if context and 'active_ids' in context:
- question_ids = context.get('active_ids')
+ if context.get('active_ids',[]):
+ question_ids = context.get('active_ids',[])
draft_question_ids = question_pool.search(cr, uid, [('state','=','draft'),('id','in',question_ids)], context=context)
question_pool.action_validate(cr, uid, draft_question_ids, context=context)
return {'type': 'ir.actions.act_window.close'}
=== modified file 'training_exam/wizard/training_seance_generate.py'
--- training_exam/wizard/training_seance_generate.py 2011-03-15 10:34:06 +0000
+++ training_exam/wizard/training_seance_generate.py 2011-03-22 08:55:07 +0000
@@ -49,7 +49,7 @@
def add_selections(self, cr, uid, ids, directory, log, context=None):
if context is None:
context = {}
- active_id = context and context.get('active_id')
+ active_id = context.get('active_id', False)
seance = self.pool.get('training.seance').browse(cr, uid, active_id, context=context)
ts = time.strptime(seance.date, '%Y-%m-%d %H:%M:%S')
date = time.strftime('%Y%m%d', ts)
=== modified file 'training_room/wizard/training_create_session_wizard.py'
--- training_room/wizard/training_create_session_wizard.py 2011-03-21 09:18:22 +0000
+++ training_room/wizard/training_create_session_wizard.py 2011-03-22 08:55:07 +0000
@@ -36,7 +36,7 @@
if context is None:
context= {}
session_pool = self.pool.get('training.session')
- active_id = context and context.get('active_id') or None
+ active_id = context.get('active_id', False)
vals = session_pool.on_change_offer(cr, uid, None, active_id)
return vals.get('value',{}).get(field,False)
Follow ups
