From 0b508d66fe8b4b0fb70f22a1f3fee5887913ad06 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Fri, 12 Oct 2012 19:23:42 +0530
Subject: [IMP] imporve code + usability
bzr revid: rgaopenerp-20121012135342-hjj8slov7yvfwal0
---
addons/google_docs/static/src/js/gdocs.js | 30 +++++++++++++----------------
addons/google_docs/static/src/xml/gdocs.xml | 8 ++++++++
2 files changed, 21 insertions(+), 17 deletions(-)
create mode 100644 addons/google_docs/static/src/xml/gdocs.xml
(limited to 'addons/google_docs/static/src')
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index bcfd24f8c0d..c2c0ded407b 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,28 +1,22 @@
openerp.google_docs = function(instance, m) {
-var _t = instance.web._t;
+var QWeb = instance.web.qweb,
+ _t = instance.web._t;
instance.web.Sidebar = instance.web.Sidebar.extend({
- on_attachments_loaded: function(attachments) {
- var self = this;
- self._super(attachments);
- // if attachment contains a google doc url do nothing
- // else display a button to create a google doc
- var flag = false;
- _.each(attachments, function(i) {
- if (i.url && i.url.match('/docs.google.com/')) { flag = true; }
+ redraw: function() {
+ var self = this;
+ this._super.apply(this, arguments);
+ self.$el.find('.oe_sidebar_add_attachment').after(QWeb.render('Google_doc', {widget: self}))
+ self.$el.find('.oe_sidebar_add_google_doc').on('click', function (e) {
+ self.on_google_doc();
});
- if (! flag) {
- this.add_items('files', [
- { label: _t('Add Google Doc...'), callback: self.on_google_doc },
- ]);
- }
},
on_google_doc: function() {
var self = this;
var form = self.getParent();
form.sidebar_context().then(function (context) {
var ds = new instance.web.DataSet(this, 'ir.attachment', context);
- ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context], function(r) {
+ def = ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context], function(r) {
if (r == 'False') {
var params = {
error: response,
@@ -33,8 +27,10 @@ var _t = instance.web._t;
modal: true,
});
}
- form.reload();
- });
+
+ }).done(function(){
+ form.reload();
+ });
})
}
})
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
new file mode 100644
index 00000000000..85a3b3f8be0
--- /dev/null
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
--
cgit v1.2.3
From 9932152fae4904e994c74a47f149615b3ca39104 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Tue, 16 Oct 2012 13:00:53 +0530
Subject: [IMP] add counter on google doc when more than one document attached
bzr revid: rgaopenerp-20121016073053-nd6s90drak6crs0a
---
addons/google_docs/static/src/js/gdocs.js | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'addons/google_docs/static/src')
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index a1704cde69c..f293447f2ea 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -3,6 +3,13 @@ var QWeb = instance.web.qweb,
_t = instance.web._t;
instance.web.Sidebar = instance.web.Sidebar.extend({
+ on_attachments_loaded: function(attachments) {
+ var self = this;
+ _.chain(attachments)
+ .filter(function(attachment){ if (attachment.name ==='Google Doc') return true})
+ .map(function(attachment, i){ attachment.name = _.str.sprintf(_t("%s (%s)"), attachment.name, i+1)})
+ self._super(attachments);
+ },
redraw: function() {
var self = this;
this._super.apply(this, arguments);
--
cgit v1.2.3
From 7368b52a95524897be9bc511035ad5a6ba28c3e4 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Tue, 16 Oct 2012 17:12:59 +0530
Subject: [IMP] counter should be apply on multiple section with same name
attribute
bzr revid: rgaopenerp-20121016114259-9g496xqj8ldal1vk
---
addons/google_docs/static/src/js/gdocs.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
(limited to 'addons/google_docs/static/src')
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index f293447f2ea..a0cc7353f3e 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,13 +1,18 @@
openerp.google_docs = function(instance, m) {
var QWeb = instance.web.qweb,
_t = instance.web._t;
-
+//{}
instance.web.Sidebar = instance.web.Sidebar.extend({
on_attachments_loaded: function(attachments) {
var self = this;
_.chain(attachments)
- .filter(function(attachment){ if (attachment.name ==='Google Doc') return true})
- .map(function(attachment, i){ attachment.name = _.str.sprintf(_t("%s (%s)"), attachment.name, i+1)})
+ .groupBy(function(attachment) { return attachment.name})
+ .each(function(attachment){
+ if(attachment.length > 1)
+ _.map(attachment, function(attachment, i){
+ attachment.name = _.str.sprintf(_t("%s (%s)"), attachment.name, i+1)
+ })
+ })
self._super(attachments);
},
redraw: function() {
--
cgit v1.2.3
From fee84c9c5d234748912d5ea9b478e72b8986a933 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)"
Date: Wed, 17 Oct 2012 12:22:24 +0530
Subject: [FIX]
bzr revid: hmo@tinyerp.com-20121017065224-go11e1c1rmvr60vy
---
addons/google_docs/static/src/js/gdocs.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'addons/google_docs/static/src')
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index fb9e95c0b63..a7d9074e2c8 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,7 +1,7 @@
openerp.google_docs = function(instance, m) {
-var QWeb = instance.web.qweb,
- _t = instance.web._t;
-//{}
+var _t = instance.web._t,
+ QWeb = instance.web.qweb;
+
instance.web.Sidebar = instance.web.Sidebar.extend({
on_attachments_loaded: function(attachments) {
var self = this;
--
cgit v1.2.3
From 99c6701ba55576f0bc0cf2ad03d27cafa1f8a2c3 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)"
Date: Wed, 17 Oct 2012 12:40:08 +0530
Subject: [IMP] document: display name with number if more than one attachment
has same number
bzr revid: hmo@tinyerp.com-20121017071008-1khlntrrdi7cxgao
---
addons/google_docs/static/src/js/gdocs.js | 16 ++--------------
addons/google_docs/static/src/xml/gdocs.xml | 4 ++--
2 files changed, 4 insertions(+), 16 deletions(-)
(limited to 'addons/google_docs/static/src')
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index a7d9074e2c8..1cdb22aeb41 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -2,23 +2,11 @@ openerp.google_docs = function(instance, m) {
var _t = instance.web._t,
QWeb = instance.web.qweb;
- instance.web.Sidebar = instance.web.Sidebar.extend({
- on_attachments_loaded: function(attachments) {
- var self = this;
- _.chain(attachments)
- .groupBy(function(attachment) { return attachment.name})
- .each(function(attachment){
- if(attachment.length > 1)
- _.map(attachment, function(attachment, i){
- attachment.name = _.str.sprintf(_t("%s (%s)"), attachment.name, i+1)
- })
- })
- self._super(attachments);
- },
+ instance.web.Sidebar.include({
redraw: function() {
var self = this;
this._super.apply(this, arguments);
- self.$el.find('.oe_sidebar_add_attachment').after(QWeb.render('Google_doc', {widget: self}))
+ self.$el.find('.oe_sidebar_add_attachment').after(QWeb.render('AddGoogleDocumentItem', {widget: self}))
self.$el.find('.oe_sidebar_add_google_doc').on('click', function (e) {
self.on_google_doc();
});
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index 85a3b3f8be0..0c8d9c3b01f 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -2,7 +2,7 @@
-
+
-
\ No newline at end of file
+
--
cgit v1.2.3
From 3da067914a9f2e3574213f2aba492c45bfb55d8d Mon Sep 17 00:00:00 2001
From: TTA <>
Date: Fri, 19 Oct 2012 16:10:20 +0530
Subject: Fixed list view issue.
bzr revid: vba@tinyerp.com-20121019104020-9tz7t6h7xwa4dali
---
addons/google_docs/static/src/js/gdocs.js | 35 +++++++++++++++++--------------
1 file changed, 19 insertions(+), 16 deletions(-)
(limited to 'addons/google_docs/static/src')
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 1cdb22aeb41..6e8ff59f377 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -13,24 +13,27 @@ var _t = instance.web._t,
},
on_google_doc: function() {
var self = this;
- var form = self.getParent();
- form.sidebar_context().then(function (context) {
- var ds = new instance.web.DataSet(this, 'ir.attachment', context);
- ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context]).then(function(r) {
- if (r == 'False') {
- var params = {
- error: response,
- message: _t("The user google credentials are not set yet. Contact your administrator for help.")
+ var view = self.getParent();
+ var ids = ( view.fields_view.type != "form" )? view.groups.get_selection().ids : [ view.datarecord.id ];
+ if( !_.isEmpty(ids) ){
+ view.sidebar_context().then(function (context) {
+ var ds = new instance.web.DataSet(this, 'ir.attachment', context);
+ ds.call('google_doc_get', [view.dataset.model, ids, context]).then(function(r) {
+ if (r == 'False') {
+ var params = {
+ error: response,
+ message: _t("The user google credentials are not set yet. Contact your administrator for help.")
+ }
+ $(openerp.web.qweb.render("DialogWarning", params)).dialog({
+ title: _t("User Google credentials are not yet set."),
+ modal: true,
+ });
}
- $(openerp.web.qweb.render("DialogWarning", params)).dialog({
- title: _t("User Google credentials are not yet set."),
- modal: true,
- });
- }
- }).done(function(){
- form.reload();
+ }).done(function(){
+ view.reload();
+ });
});
- });
+ }
}
});
};
--
cgit v1.2.3