summaryrefslogtreecommitdiff
path: root/addons/google_drive/static/src
diff options
context:
space:
mode:
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>2013-08-13 15:36:54 +0530
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>2013-08-13 15:36:54 +0530
commita43756743d5da2b9fbec26a50c30a5d54fd8c2ff (patch)
tree1125e693ced946c1bf3c2cbb2601a82401bd6e5e /addons/google_drive/static/src
parente4efdf89b5dc9155639d3b33a785d75dd9323e05 (diff)
parente8164c9a927ec8339252712bae3bf0a5ca1760e3 (diff)
[MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130813100654-smw3i7jeu3zwlwte
Diffstat (limited to 'addons/google_drive/static/src')
-rw-r--r--addons/google_drive/static/src/js/gdrive.js29
1 files changed, 17 insertions, 12 deletions
diff --git a/addons/google_drive/static/src/js/gdrive.js b/addons/google_drive/static/src/js/gdrive.js
index 3267487b4e3..dbbe50d0794 100644
--- a/addons/google_drive/static/src/js/gdrive.js
+++ b/addons/google_drive/static/src/js/gdrive.js
@@ -29,19 +29,24 @@ openerp.google_drive = function (instance, m) {
ds.call('get_google_drive_config', [view.dataset.model, res_id, context]).done(function (r) {
if (!_.isEmpty(r)) {
_.each(r, function (res) {
- var g_item = _.indexOf(_.pluck(self.items.other, 'label'), res.name);
- if (g_item !== -1) {
- self.items.other.splice(g_item, 1);
+ var already_there = false;
+ for (var i = 0;i < self.items.other.length;i++){
+ if (self.items.other[i].classname === "oe_share_gdoc" && self.items.other[i].label.indexOf(res.name) > -1){
+ already_there = true;
+ break;
+ }
+ }
+ if (!already_there){
+ self.add_items('other', [{
+ label: res.name+ '<img style="position:absolute;right:5px;height:20px;width:20px;" title="Google Drive" src="google_drive/static/src/img/drive_icon.png"/>',
+ config_id: res.id,
+ res_id: res_id,
+ res_model: view.dataset.model,
+ callback: self.on_google_doc,
+ classname: 'oe_share_gdoc'
+ },
+ ]);
}
- self.add_items('other', [{
- label: res.name+ '<img style="position:absolute;right:5px;height:20px;width:20px;" title="Google Drive" src="google_drive/static/src/img/drive_icon.png"/>',
- config_id: res.id,
- res_id: res_id,
- res_model: view.dataset.model,
- callback: self.on_google_doc,
- classname: 'oe_share_gdoc'
- },
- ]);
})
}
});