[Imp]Removing the virtual item while moving to next record
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Mon, 11 Mar 2013 11:26:49 +0000 (16:56 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Mon, 11 Mar 2013 11:26:49 +0000 (16:56 +0530)
bzr revid: dhr@tinyerp.com-20130311112649-wzt7n8h718g7cabv

addons/google_docs/__openerp__.py
addons/google_docs/static/src/js/gdocs.js

index f804ecc..ca51719 100644 (file)
@@ -28,7 +28,7 @@
     'installable': True,
     'auto_install': False,
     'js': ['static/src/js/gdocs.js'],
-    'qweb': ['static/src/xml/gdocs.xml'],
+#    'qweb': ['static/src/xml/gdocs.xml'],
     'data': [
         'security/ir.model.access.csv',
         'res_config_user_view.xml'
index a0f1cba..e5461e2 100644 (file)
@@ -19,21 +19,25 @@ var _t = instance.web._t,
                }
                },
         
-               add_gdoc_items: function(view,ids){
-                       $('.oe_share_gdoc').remove();
+             add_gdoc_items: function(view,ids){
                        var self = this;
+                       var gdoc_item = _.indexOf(_.pluck(self.items.other,'classname'),'oe_share_gdoc');
+                       if(gdoc_item !== -1)
+                       {
+                               self.items.other.splice(gdoc_item,1);
+                       }
                        if( !_.isEmpty(ids) ){
                        view.sidebar_eval_context().done(function (context) {
                            var ds = new instance.web.DataSet(this, 'ir.attachment', context);
                            ds.call('google_doc_get', [view.dataset.model, ids, context]).done(function(r) {
-                               console.log("thjoid ",self.items['other'])
                                if(!_.isEmpty(r)){
                                _.each(r,function(res){
-                                       _.each(self.items['other'],function(others){
-                                               if(others['label'] == res){
-                                                       self.items['other'].pop()
-                                               }
-                                       })
+                                       var g_item = _.indexOf(_.pluck(self.items.other,'label'),res);
+                                               if(g_item !== -1)
+                                               {
+                                                       self.items.other.splice(g_item,1);
+                                               }
+                                  
                                        self.add_items('other', [
                                    {   label: res,
                                        callback: self.on_google_doc,
@@ -46,6 +50,7 @@ var _t = instance.web._t,
                         }
                },
         
+        
                on_google_doc: function(r) {
                    var self = this;
                    var view = self.getParent();
@@ -54,7 +59,6 @@ var _t = instance.web._t,
                        view.sidebar_eval_context().done(function (context) {
                            var ds = new instance.web.DataSet(this, 'ir.attachment', context);
                            ds.call('get_attachment', [view.dataset.model, r, ids, context]).done(function(res) {
-                               console.log('resssssss',res)
                                window.open(res.url,"_blank");
                                view.reload();
                            })