From fb285d869548a75457bf7fe89a22801de4269c91 Mon Sep 17 00:00:00 2001 From: Samus CTO Date: Fri, 27 Feb 2015 17:16:16 +0100 Subject: [PATCH 1/2] [FIX] prevent unneeded chmod datadir, but check writable --- openerp/tools/config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openerp/tools/config.py b/openerp/tools/config.py index b07bbf99c05..21b15132fa3 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -683,7 +683,8 @@ class configmanager(object): if not os.path.exists(d): os.makedirs(d, 0700) else: - os.chmod(d, 0700) + assert os.access(d, os.W_OK), \ + "%s: directory is not writable" % d return d @property @@ -692,7 +693,8 @@ class configmanager(object): if not os.path.exists(d): os.makedirs(d, 0700) else: - os.chmod(d, 0700) + assert os.access(d, os.W_OK), \ + "%s: directory is not writable" % d return d def filestore(self, dbname): From 128de187a322ec561a194e5dfba6c04761c4c1e5 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 27 Feb 2015 17:18:06 +0100 Subject: [PATCH 2/2] [FIX] web: KanbanSelection and Priority widgets Use directly datarecord id instead of previously stored value which may not be up to date. --- addons/web/static/src/js/view_form.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index df1b0033569..4de993bee3f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2365,7 +2365,6 @@ instance.web.form.KanbanSelection = instance.web.form.FieldChar.extend({ }, render_value: function() { var self = this; - this.record_id = this.view.datarecord.id; this.states = this.prepare_dropdown_selection();; this.$el.html(QWeb.render("KanbanSelection", {'widget': self})); this.$el.find('li').on('click', this.set_kanban_selection.bind(this)); @@ -2383,7 +2382,7 @@ instance.web.form.KanbanSelection = instance.web.form.FieldChar.extend({ write_values[self.name] = value; return this.view.dataset._model.call( 'write', [ - [self.record_id], + [this.view.datarecord.id], write_values, self.view.dataset.get_context() ]).done(self.reload_record.bind(self)); @@ -2421,7 +2420,6 @@ instance.web.form.Priority = instance.web.form.FieldChar.extend({ }, render_value: function() { var self = this; - this.record_id = this.view.datarecord.id; this.priorities = this.prepare_priority(); this.$el.html(QWeb.render("Priority", {'widget': this})); if (!this.get('readonly')){ @@ -2441,7 +2439,7 @@ instance.web.form.Priority = instance.web.form.FieldChar.extend({ write_values[self.name] = value; return this.view.dataset._model.call( 'write', [ - [self.record_id], + [this.view.datarecord.id], write_values, self.view.dataset.get_context() ]).done(self.reload_record.bind(self));