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

[MERGE] forward port of branch 8.0 up to 128de18

Browse Source
This commit is contained in:
Christophe Simonis
2015-02-27 17:23:49 +01:00
parent 1abe1eac87 128de187a3
commit 93194c8260
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/view_form.js
+2 -4
View File
@@ -2439,7 +2439,6 @@ instance.web.form.KanbanSelection = instance.web.form.FieldChar.extend({
},
render_value: function() {
var self = this;
this.record_id = this.view.datarecord.id;
var dd_fetched = this.prepare_dropdown_selection();;
return $.when(dd_fetched).then(function (states) {
self.states = states;
@@ -2460,7 +2459,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));
@@ -2498,7 +2497,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')){
@@ -2518,7 +2516,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));
openerp/tools/config.py
+4 -2
View File
@@ -627,7 +627,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
@@ -636,7 +637,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):