diff options
| author | Raphael Collet <rco@openerp.com> | 2014-07-06 16:44:26 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2014-07-06 17:05:41 +0200 |
| commit | cbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch) | |
| tree | d6ff62b719fce32392397783c961b734b1e4c50e /addons/google_drive | |
| parent | d78192c489d3be66cd6487b39f5ce7ba4733a187 (diff) | |
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.
- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
Diffstat (limited to 'addons/google_drive')
| -rw-r--r-- | addons/google_drive/google_drive.py | 2 | ||||
| -rw-r--r-- | addons/google_drive/static/src/xml/gdocs.xml | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py index 779b0231540..036b815648b 100644 --- a/addons/google_drive/google_drive.py +++ b/addons/google_drive/google_drive.py @@ -40,7 +40,7 @@ class config(osv.Model): config = self.browse(cr, SUPERUSER_ID, config_id, context=context) model = config.model_id filter_name = config.filter_id and config.filter_id.name or False - record = self.pool.get(model.model).read(cr, uid, res_id, [], context=context) + record = self.pool.get(model.model).read(cr, uid, [res_id], context=context)[0] record.update({'model': model.name, 'filter': filter_name}) name_gdocs = config.name_template try: diff --git a/addons/google_drive/static/src/xml/gdocs.xml b/addons/google_drive/static/src/xml/gdocs.xml deleted file mode 100644 index 0c8d9c3b01f..00000000000 --- a/addons/google_drive/static/src/xml/gdocs.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- vim:fdl=1: ---> -<templates id="template" xml:space="preserve"> -<t t-name="AddGoogleDocumentItem"> - <li class="oe_sidebar_add_google_doc"><span><b>Add Google Doc...</b></span></li> -</t> -</templates> |