pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port of branch saas-6 up to 7f5ca1d

Browse Source
This commit is contained in:
Christophe Simonis
2016-04-05 19:04:36 +02:00
parent ec444bf091 7f5ca1d94a
commit 9e2de9b1ae
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/views/list_view.js
+1 -1
View File
@@ -1156,7 +1156,7 @@ ListView.List = Class.extend( /** @lends instance.web.ListView.List# */{
record.set(column.id, names[0]); record.set(column.id, names[0]);
}); });
} }
} else if (column.type === 'many2many' || column.type === 'one2many') { } else if (column.type === 'many2many') {
value = record.get(column.id); value = record.get(column.id);
// non-resolved (string) m2m values are arrays // non-resolved (string) m2m values are arrays
if (value instanceof Array && !_.isEmpty(value) if (value instanceof Array && !_.isEmpty(value)
openerp/modules/loading.py
+4 -1
View File
@@ -416,7 +416,10 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
t0 = time.time() t0 = time.time()
t0_sql = openerp.sql_db.sql_counter t0_sql = openerp.sql_db.sql_counter
if openerp.tools.config['test_enable']: if openerp.tools.config['test_enable']:
cr.execute("SELECT name FROM ir_module_module WHERE state='installed'") if update_module:
cr.execute("SELECT name FROM ir_module_module WHERE state='installed' and name = ANY(%s)", (processed_modules,))
else:
cr.execute("SELECT name FROM ir_module_module WHERE state='installed'")
for module_name in cr.fetchall(): for module_name in cr.fetchall():
report.record_result(openerp.modules.module.run_unit_tests(module_name[0], cr.dbname, position=runs_post_install)) report.record_result(openerp.modules.module.run_unit_tests(module_name[0], cr.dbname, position=runs_post_install))
_logger.log(25, "All post-tested in %.2fs, %s queries", time.time() - t0, openerp.sql_db.sql_counter - t0_sql) _logger.log(25, "All post-tested in %.2fs, %s queries", time.time() - t0, openerp.sql_db.sql_counter - t0_sql)