Nicolas (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-simplerendering-niv into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-simplerendering-niv/+merge/129421
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-simplerendering-niv/+merge/129421
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-simplerendering-niv.
=== modified file 'mail/static/src/js/mail.js'
--- mail/static/src/js/mail.js 2012-10-10 18:16:11 +0000
+++ mail/static/src/js/mail.js 2012-10-12 12:58:34 +0000
@@ -1156,6 +1156,7 @@
this.$el.toggle(this.view.get("actual_mode") !== "create");
},
+<<<<<<< TREE
/**
* Reinitialize the widget field and Display the threads
* @param {Object} new_context: context of the refresh
@@ -1163,6 +1164,9 @@
set_value: function() {
var self = this;
this._super.apply(this, arguments);
+=======
+ render_value: function() {
+>>>>>>> MERGE-SOURCE
if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
this.$('oe_mail_thread').hide();
return;
=== modified file 'mail/static/src/js/mail_followers.js'
--- mail/static/src/js/mail_followers.js 2012-10-10 18:16:11 +0000
+++ mail/static/src/js/mail_followers.js 2012-10-12 12:58:34 +0000
@@ -88,9 +88,9 @@
});
},
- set_value: function(value_) {
+ render_value: function() {
this.reinit();
- return this.fetch_followers(value_ || this.get_value());
+ return this.fetch_followers(this.get("value"));
},
set_is_follower: function(value_) {
=== modified file 'pad/static/src/js/pad.js'
--- pad/static/src/js/pad.js 2012-09-25 13:55:57 +0000
+++ pad/static/src/js/pad.js 2012-10-12 12:58:34 +0000
@@ -4,16 +4,13 @@
template: 'FieldPad',
configured: false,
content: "",
- set_value: function(val) {
+ render_value: function() {
var self = this;
- var _super = self._super;
- _super.apply(self,[val]);
-
- if (val === false || val === "") {
- self.field_manager.dataset.call('pad_generate_url',{context:{
- model: self.field_manager.model,
+ if (this.get("value") === false || this.get("value") === "") {
+ self.view.dataset.call('pad_generate_url',{context:{
+ model: self.view.model,
field_name: self.name,
- object_id: self.field_manager.datarecord.id
+ object_id: self.view.datarecord.id
}}).then(function(data) {
if(data&&data.url){
_super.apply(self,[data.url]);
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
