openerp-community team mailing list archive

[Niels Huylebroeck <niels@xxxxxxxxxxxxx>]

Niels Huylebroeck has proposed merging lp:~openerp-community/openobject-addons/fix-mail_followers-message_subtype_data into lp:openobject-addons/7.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #1096809 in OpenERP Web: "[General Web] Traceback when clicking on page arrows several times in a row"
  https://bugs.launchpad.net/openerp-web/+bug/1096809
  Bug #1097208 in OpenERP Web: "message_subtype_data is undefined"
  https://bugs.launchpad.net/openerp-web/+bug/1097208

For more details, see:
https://code.launchpad.net/~openerp-community/openobject-addons/fix-mail_followers-message_subtype_data/+merge/142288

This merge request is very similar to https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1096809-bth/+merge/142266

But the exception is that this branch was created on a revision a lot lower to enable it to be merged in both 7.0 and trunk revisions.
-- 
https://code.launchpad.net/~openerp-community/openobject-addons/fix-mail_followers-message_subtype_data/+merge/142288
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-addons/fix-mail_followers-message_subtype_data.

=== modified file 'mail/static/src/js/mail_followers.js'
--- mail/static/src/js/mail_followers.js	2012-12-27 10:37:01 +0000
+++ mail/static/src/js/mail_followers.js	2013-01-08 11:34:16 +0000
@@ -216,6 +216,7 @@
         display_subtypes:function (data) {
             var self = this;
             var subtype_list_ul = this.$('.oe_subtype_list');
+<<<<<<< TREE
             subtype_list_ul.empty();
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
             var nb_subtype = 0;
@@ -227,6 +228,14 @@
                     $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo( self.$('.oe_subtype_list') );
                 });
             }
+=======
+            _(data).each(function(i) {records = i.message_subtype_data;});
+            _(records).each(function (record, record_name) {
+                record.name = record_name;
+                record.followed = record.followed || undefined;
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo( self.$('.oe_subtype_list') );
+            });
+>>>>>>> MERGE-SOURCE
         },
 
         do_follow: function () {