[MERGE] forward port branch 8.0 up to 5ee4344

This commit is contained in:
Christophe Simonis
2016-10-27 14:11:46 +02:00
4 changed files with 20 additions and 11 deletions
+4 -3
View File
@@ -553,11 +553,12 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
self.records.remove(record); self.records.remove(record);
return; return;
} }
_.each(values, function (value, key) { // _.each is broken if a field "length" is present
for (var key in values) {
if (fields[key] && fields[key].type === 'many2many') if (fields[key] && fields[key].type === 'many2many')
record.set(key + '__display', false, {silent: true}); record.set(key + '__display', false, {silent: true});
record.set(key, value, {silent: true}); record.set(key, values[key], {silent: true});
}); }
record.trigger('change', record); record.trigger('change', record);
}); });
}, },
+1 -1
View File
@@ -16,6 +16,7 @@ Depends:
adduser, adduser,
postgresql-client, postgresql-client,
python, python,
python-babel,
python-dateutil, python-dateutil,
python-decorator, python-decorator,
python-docutils, python-docutils,
@@ -31,7 +32,6 @@ Depends:
python-passlib, python-passlib,
python-psutil, python-psutil,
python-psycopg2, python-psycopg2,
python-pybabel,
python-pychart, python-pychart,
python-pydot, python-pydot,
python-pyparsing, python-pyparsing,
+13 -5
View File
@@ -130,7 +130,7 @@ class configmanager(object):
group.add_option("--addons-path", dest="addons_path", group.add_option("--addons-path", dest="addons_path",
help="specify additional addons paths (separated by commas).", help="specify additional addons paths (separated by commas).",
action="callback", callback=self._check_addons_path, nargs=1, type="string") action="callback", callback=self._check_addons_path, nargs=1, type="string")
group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules default=web") group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules. Default is 'web,web_kanban'")
group.add_option("-D", "--data-dir", dest="data_dir", my_default=_get_default_datadir(), group.add_option("-D", "--data-dir", dest="data_dir", my_default=_get_default_datadir(),
help="Directory where to store Odoo data") help="Directory where to store Odoo data")
@@ -409,6 +409,7 @@ class configmanager(object):
'test_file', 'test_enable', 'test_commit', 'test_report_directory', 'test_file', 'test_enable', 'test_commit', 'test_report_directory',
'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent', 'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent',
'data_dir', 'data_dir',
'server_wide_modules',
] ]
posix_keys = [ posix_keys = [
@@ -473,14 +474,21 @@ class configmanager(object):
#if self.options['db_host']: #if self.options['db_host']:
# self._generate_pgpassfile() # self._generate_pgpassfile()
# server_wide_modules defaults to web,web_kanban if empty or unset
server_wide_modules = self.options['server_wide_modules'] = (
self.options['server_wide_modules']
if self.options['server_wide_modules']
else 'web,web_kanban'
)
if opt.save: if opt.save:
self.save() self.save()
openerp.conf.addons_paths = self.options['addons_path'].split(',') openerp.conf.addons_paths = self.options['addons_path'].split(',')
if opt.server_wide_modules:
openerp.conf.server_wide_modules = map(lambda m: m.strip(), opt.server_wide_modules.split(',')) openerp.conf.server_wide_modules = [
else: m.strip() for m in server_wide_modules.split(',')
openerp.conf.server_wide_modules = ['web','web_kanban'] ]
def _generate_pgpassfile(self): def _generate_pgpassfile(self):
""" """
+1 -1
View File
@@ -20,6 +20,7 @@ RUN apt-get update -qq && \
postgresql \ postgresql \
postgresql-client \ postgresql-client \
python \ python \
python-babel \
python-dateutil \ python-dateutil \
python-decorator \ python-decorator \
python-docutils \ python-docutils \
@@ -35,7 +36,6 @@ RUN apt-get update -qq && \
python-passlib \ python-passlib \
python-psutil \ python-psutil \
python-psycopg2 \ python-psycopg2 \
python-pybabel \
python-pychart \ python-pychart \
python-pydot \ python-pydot \
python-pyparsing \ python-pyparsing \