savoirfairelinux-openerp team mailing list archive

["Guewen Baconnier @ Camptocamp" <guewen.baconnier@xxxxxxxxxxxxxx>]

Hi,

It seems nice.

I left a few comments in the diff. I won't really block on them but you should have a look.

Diff comments:

> === added directory 'cmis_read'
> === added file 'cmis_read/__init__.py'
> --- cmis_read/__init__.py	1970-01-01 00:00:00 +0000
> +++ cmis_read/__init__.py	2014-06-12 19:57:17 +0000
> @@ -0,0 +1,25 @@
> +# -*- encoding: utf-8 -*-
> +##############################################################################
> +#
> +#    OpenERP, Open Source Management Solution
> +#    This module copyright (C) 2014 Savoir-faire Linux
> +#    (<http://www.savoirfairelinux.com>).
> +#
> +#    This program is free software: you can redistribute it and/or modify
> +#    it under the terms of the GNU Affero General Public License as
> +#    published by the Free Software Foundation, either version 3 of the
> +#    License, or (at your option) any later version.
> +#
> +#    This program is distributed in the hope that it will be useful,
> +#    but WITHOUT ANY WARRANTY; without even the implied warranty of
> +#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +#    GNU Affero General Public License for more details.
> +#
> +#    You should have received a copy of the GNU Affero General Public License
> +#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +#
> +##############################################################################
> +
> +from . import wizard
> +
> +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
> 
> === added file 'cmis_read/__openerp__.py'
> --- cmis_read/__openerp__.py	1970-01-01 00:00:00 +0000
> +++ cmis_read/__openerp__.py	2014-06-12 19:57:17 +0000
> @@ -0,0 +1,74 @@
> +# -*- encoding: utf-8 -*-
> +##############################################################################
> +#
> +#    OpenERP, Open Source Management Solution
> +#    This module copyright (C) 2014 Savoir-faire Linux
> +#    (<http://www.savoirfairelinux.com>).
> +#
> +#    This program is free software: you can redistribute it and/or modify
> +#    it under the terms of the GNU Affero General Public License as
> +#    published by the Free Software Foundation, either version 3 of the
> +#    License, or (at your option) any later version.
> +#
> +#    This program is distributed in the hope that it will be useful,
> +#    but WITHOUT ANY WARRANTY; without even the implied warranty of
> +#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +#    GNU Affero General Public License for more details.
> +#
> +#    You should have received a copy of the GNU Affero General Public License
> +#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +#
> +##############################################################################
> +
> +{
> +    'name': 'CMIS Read',
> +    'version': '0.1',
> +    'category': 'Knowledge Management',
> +    'summary': 'Store Document File in a Remote CMIS Server',
> +    'description': """
> +This module allows you to use the CMIS backend to search in the DMS repository
> +and attach documents to OpenERP records.
> +
> +Configuration
> +=============
> +
> +Create a new CMIS backend with the host, login and password.
> +
> +Usage
> +=====
> +
> +* On one OpenERP record, click "Add from DMS".
> +* Type your query and then click on "Search".
> +* Filter your results if necessary
> +* Select the documents you want to attach
> +* Selected documents will be enqueued for importing
> +
> +Contributors
> +------------
> +* El Hadji Dem (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
> +""",
> +    'author': 'Savoir-faire Linux',
> +    'website': 'www.savoirfairelinux.com',
> +    'license': 'AGPL-3',
> +    'depends': [
> +        'document',
> +        'cmis'
> +    ],
> +    'data': [
> +        'security/ir.model.access.csv',
> +        'wizard/document_wizard_view.xml',
> +    ],
> +    'js': [
> +        'static/src/js/document.js'
> +    ],
> +    'qweb': [
> +        'static/src/xml/document.xml'
> +    ],
> +    'test': [],
> +    'demo': [
> +    ],
> +    'installable': True,
> +    'auto_install': False,
> +}
> +
> +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
> 
> === added directory 'cmis_read/i18n'
> === added file 'cmis_read/i18n/cmis_read.pot'
> --- cmis_read/i18n/cmis_read.pot	1970-01-01 00:00:00 +0000
> +++ cmis_read/i18n/cmis_read.pot	2014-06-12 19:57:17 +0000
> @@ -0,0 +1,119 @@
> +# Translation of OpenERP Server.
> +# This file contains the translation of the following modules:
> +# 	* cmis_read
> +#
> +msgid ""
> +msgstr ""
> +"Project-Id-Version: OpenERP Server 7.0\n"
> +"Report-Msgid-Bugs-To: \n"
> +"POT-Creation-Date: 2014-03-21 14:55+0000\n"
> +"PO-Revision-Date: 2014-03-21 10:55-0500\n"
> +"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
> +"Language-Team: \n"
> +"MIME-Version: 1.0\n"
> +"Content-Type: text/plain; charset=UTF-8\n"
> +"Content-Transfer-Encoding: 8bit\n"
> +"Plural-Forms: \n"
> +"X-Generator: Poedit 1.5.4\n"
> +
> +#. module: cmis_read
> +#: field:ir.attachment.dms,file_id:0
> +msgid "File ID"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: field:ir.attachment.dms.wizard,attachment_ids:0
> +msgid "Attachments"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: view:ir.attachment.dms.wizard:0
> +msgid "Search Document"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: field:ir.attachment.dms,name:0 help:ir.attachment.dms,name:0
> +#: field:ir.attachment.dms.wizard,name:0 help:ir.attachment.dms.wizard,name:0
> +msgid "File name"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: code:addons/cmis_read/wizard/document_wizard.py:59
> +#, python-format
> +msgid "You have to fill in the file name. And try again"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: help:ir.attachment.dms,file_id:0
> +msgid "File Id"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: model:_description:0 model:ir.model,name:cmis_read.model_ir_attachment_dms
> +msgid "ir.attachment.dms"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: field:ir.attachment.dms,owner:0 help:ir.attachment.dms,owner:0
> +msgid "Owner"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: view:ir.attachment.dms.wizard:0
> +msgid ""
> +"This action allows you to search by file name and to add the document you "
> +"select"
> +msgstr ""
> +
> +#. module: cmis_read
> +#. openerp-web
> +#: code:addons/cmis_read/static/src/js/document.js:26
> +#, python-format
> +msgid "Search Document from DMS"
> +msgstr ""
> +
> +#. module: cmis_read
> +#. openerp-web
> +#: code:addons/cmis_read/static/src/xml/document.xml:7
> +#, python-format
> +msgid "Add Doc from DMS..."
> +msgstr ""
> +
> +#. module: cmis_read
> +#: code:addons/cmis_read/wizard/document_wizard.py:58
> +#: code:addons/cmis_read/wizard/document_wizard.py:86
> +#, python-format
> +msgid "Error"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: view:ir.attachment.dms.wizard:0
> +msgid "Cancel"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: view:ir.attachment.dms.wizard:0
> +msgid "Apply"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: model:_description:0
> +#: model:ir.model,name:cmis_read.model_ir_attachment_dms_wizard
> +msgid "ir.attachment.dms.wizard"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: view:ir.attachment.dms.wizard:0
> +msgid "Search"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: view:ir.attachment.dms.wizard:0
> +msgid "or"
> +msgstr ""
> +
> +#. module: cmis_read
> +#: code:addons/cmis_read/wizard/document_wizard.py:87
> +#, python-format
> +msgid "You have to select at least 1 Document. And try again"
> +msgstr ""
> 
> === added directory 'cmis_read/security'
> === added file 'cmis_read/security/ir.model.access.csv'
> --- cmis_read/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
> +++ cmis_read/security/ir.model.access.csv	2014-06-12 19:57:17 +0000
> @@ -0,0 +1,2 @@
> +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
> +access_ir_attachment_dms_wizard,access_ir_attachment_dms_wizard,model_ir_attachment_dms_wizard,base.group_document_user,1,1,1,1
> 
> === added directory 'cmis_read/static'
> === added directory 'cmis_read/static/src'
> === added directory 'cmis_read/static/src/js'
> === added file 'cmis_read/static/src/js/document.js'
> --- cmis_read/static/src/js/document.js	1970-01-01 00:00:00 +0000
> +++ cmis_read/static/src/js/document.js	2014-06-12 19:57:17 +0000
> @@ -0,0 +1,44 @@
> +openerp.cmis_read = function(instance, m) {
> +var _t = instance.web._t,
> +    QWeb = instance.web.qweb;
> +
> +    instance.web.Sidebar.include({
> +        redraw: function() {
> +            var self = this;
> +            this._super.apply(this, arguments);
> +            self.$el.find('.oe_sidebar_add_attachment').after(QWeb.render('AddDocfromdms', {widget: self}))
> +            self.$el.find('.oe_sidebar_add_dms_doc').on('click', function (e) {
> +                self.on_cmis_doc();
> +            });
> +        },
> +        on_cmis_doc: function(state) {
> +            var self = this;
> +            var view = self.getParent();
> +            var ids = ( view.fields_view.type != "form" )? view.groups.get_selection().ids : [ view.datarecord.id ];
> +            var ds = new instance.web.DataSet(this, 'ir.attachment', context);
> +            // you can pass in other data using the context dictionary variable
> +            var context = {
> +            'model': view.dataset.model,
> +            'ids': ids,
> +            };
> +            // the action dictionary variable sends data in the "self.do_action" method
> +            var action = {
> +                name: _t("Search Document from DMS"),
> +                type: 'ir.actions.act_window',
> +                res_model: 'ir.attachment.dms.wizard',
> +                view_mode: 'form',
> +                view_type: 'form',
> +                views: [[false, 'form']],
> +                target: 'new',
> +                context: context,
> +            };
> +            // self.do_action accepts the action parameter and opens the new view
> +            self.do_action(action, {
> +                // refresh list of documents
> +                on_close: function () {
> +                    self.do_attachement_update(self.dataset, self.model_id);
> +                }
> +            });
> +        }
> +    });
> +};
> 
> === added directory 'cmis_read/static/src/xml'
> === added file 'cmis_read/static/src/xml/document.xml'
> --- cmis_read/static/src/xml/document.xml	1970-01-01 00:00:00 +0000
> +++ cmis_read/static/src/xml/document.xml	2014-06-12 19:57:17 +0000
> @@ -0,0 +1,10 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!-- vim:fdl=1:
> +-->
> +<templates id="template" xml:space="preserve">
> +
> +<t t-name="AddDocfromdms">
> +     <li class="oe_sidebar_add_dms_doc"><span><b>Add Doc from DMS...</b></span></li>
> +</t>
> +
> +</templates>
> 
> === added directory 'cmis_read/wizard'
> === added file 'cmis_read/wizard/__init__.py'
> --- cmis_read/wizard/__init__.py	1970-01-01 00:00:00 +0000
> +++ cmis_read/wizard/__init__.py	2014-06-12 19:57:17 +0000
> @@ -0,0 +1,25 @@
> +# -*- encoding: utf-8 -*-
> +##############################################################################
> +#
> +#    OpenERP, Open Source Management Solution
> +#    This module copyright (C) 2014 Savoir-faire Linux
> +#    (<http://www.savoirfairelinux.com>).
> +#
> +#    This program is free software: you can redistribute it and/or modify
> +#    it under the terms of the GNU Affero General Public License as
> +#    published by the Free Software Foundation, either version 3 of the
> +#    License, or (at your option) any later version.
> +#
> +#    This program is distributed in the hope that it will be useful,
> +#    but WITHOUT ANY WARRANTY; without even the implied warranty of
> +#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +#    GNU Affero General Public License for more details.
> +#
> +#    You should have received a copy of the GNU Affero General Public License
> +#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +#
> +##############################################################################
> +
> +from . import document_wizard
> +
> +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
> 
> === added file 'cmis_read/wizard/document_wizard.py'
> --- cmis_read/wizard/document_wizard.py	1970-01-01 00:00:00 +0000
> +++ cmis_read/wizard/document_wizard.py	2014-06-12 19:57:17 +0000
> @@ -0,0 +1,184 @@
> +# -*- encoding: utf-8 -*-
> +##############################################################################
> +#
> +#    OpenERP, Open Source Management Solution
> +#    This module copyright (C) 2014 Savoir-faire Linux
> +#    (<http://www.savoirfairelinux.com>).
> +#
> +#    This program is free software: you can redistribute it and/or modify
> +#    it under the terms of the GNU Affero General Public License as
> +#    published by the Free Software Foundation, either version 3 of the
> +#    License, or (at your option) any later version.
> +#
> +#    This program is distributed in the hope that it will be useful,
> +#    but WITHOUT ANY WARRANTY; without even the implied warranty of
> +#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +#    GNU Affero General Public License for more details.
> +#
> +#    You should have received a copy of the GNU Affero General Public License
> +#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +#
> +##############################################################################
> +
> +from openerp.osv import orm, fields
> +from openerp.tools.translate import _
> +from openerp.addons.connector.session import ConnectorSession
> +from openerp.addons.connector.queue.job import job
> +from openerp import SUPERUSER_ID
> +import logging
> +_logger = logging.getLogger(__name__)
> +
> +
> +class ir_attachment_edm_wizard(orm.Model):
> +    _name = 'ir.attachment.dms.wizard'
> +
> +    _columns = {
> +        'name': fields.char('File name', size=150, help="File name"),

The size is not mandatory and should be used only when it is a constraint.

> +        'attachment_ids': fields.one2many('ir.attachment.dms',
> +                                          'wizard_id'),
> +    }
> +
> +    # Search documents from dms.
> +    def search_doc(self, cr, uid, ids, context=None):
> +        if context is None:
> +            context = {}

useless: context is not accessed so we don't mind if it is None

> +        this = self.browse(cr, uid, ids, context=context)[0]
> +        data = self.read(cr, uid, ids, [], context=context)[0]
> +        if not data['name']:
> +            raise orm.except_orm(_('Error'),
> +                                 _('You have to fill in the file name.' +

The '+' is useless, lines will be appended anyway. But you should add a space after the dot.

> +                                   'And try again'))
> +        if not hasattr(ids, '__iter__'):
> +            ids = [ids]
> +        session = ConnectorSession(cr, uid, context=context)
> +        file_name = data['name']
> +        for backend_id in ids:
> +            search_doc_from_dms(session, 'ir.attachment',
> +                                backend_id, file_name, this.id)
> +        return {
> +            'type': 'ir.actions.act_window',
> +            'res_model': 'ir.attachment.dms.wizard',
> +            'view_mode': 'form',
> +            'view_type': 'form',
> +            'res_id': this.id,
> +            'views': [(False, 'form')],
> +            'target': 'new',
> +        }
> +
> +    # Adding documents from Document Management (EDM) to OE.
> +    def action_apply(self, cr, uid, ids, context=None):
> +        ir_attachment_dms_obj = self.pool.get('ir.attachment.dms')

self.pool['ir.attachment.dms'] is better

> +        if context is None:
> +            context = {}
> +        model = context['model']
> +        res_id = context['ids'][0]
> +        ir_model_obj = self.pool.get(context['model'])
> +        name = ir_model_obj.browse(cr, uid, context['ids'],
> +                                   context=context)[0]['name']
> +        data = self.read(cr, uid, ids, [], context=context)[0]
> +
> +        if not hasattr(ids, '__iter__'):
> +            ids = [ids]
> +        session = ConnectorSession(cr, uid, context=context)
> +        # Just take the lines we select in the tree view
> +        selected_data = [one_attachment.id for one_attachment in
> +                         ir_attachment_dms_obj.browse(
> +                             cr, uid, data['attachment_ids'], context)
> +                         if one_attachment.selectable_ok]
> +        data['attachment_ids'] = selected_data
> +        if not data['attachment_ids']:
> +            raise orm.except_orm(_('Error'),
> +                                 _('You have to select at least 1 Document.' +

useless '+', but misses a space after the dot (or maybe better to remove the dot and the capital)

> +                                   'And try again'))
> +        for backend_id in ids:
> +            # Create doc in OE from DMS.
> +            create_doc_from_dms.delay(session, 'ir.attachment', backend_id,
> +                                      data, name, model, res_id, uid)
> +        return {'type': 'ir.actions.act_window_close'}
> +
> +
> +class ir_attachment_dms(orm.TransientModel):
> +    _name = 'ir.attachment.dms'
> +
> +    _columns = {
> +        'name': fields.char('File name', size=150,

As said before, size is not mandatory and should be used only when it is a constraint.

> +                            readonly=True,
> +                            help="File name"),
> +        'owner': fields.char('Owner', size=150,
> +                             readonly=True,
> +                             help="Owner"),
> +        'file_id': fields.char('File ID', size=150,
> +                               readonly=True,
> +                               help="File Id"),
> +        'wizard_id': fields.many2one('ir.attachment.dms.wizard',
> +                                     string='Wizard',
> +                                     required=True),
> +        'selectable_ok': fields.boolean('Selected', help="Selected."),
> +    }
> +
> +
> +def search_doc_from_dms(session, model_name, backend_id, file_name, wizard_id):
> +    ir_attach_dms_obj = session.pool.get('ir.attachment.dms')
> +    cmis_backend_obj = session.pool.get('cmis.backend')
> +    if session.context is None:
> +        session.context = {}

2 useless lines (we don't mind if the context is None, and should not be None http://bazaar.launchpad.net/~openerp-connector-core-editors/openerp-connector/7.0/view/head:/connector/session.py#L121)

> +    # login with the cmis account
> +    repo = cmis_backend_obj._auth(session.cr, session.uid,
> +                                  context=session.context)
> +
> +    # Search name of doc and delete it if the document is already existed
> +    attachment_ids = ir_attach_dms_obj.search(session.cr, session.uid, [])

could be:
session.search('ir.attachment.dms', [])

> +    ir_attach_dms_obj.unlink(session.cr, session.uid,

could be:
session.unlink('ir.attachment.dms', attachment_ids)

> +                             attachment_ids, context=session.context)
> +    results = cmis_backend_obj.safe_query(
> +        "SELECT cmis:name, cmis:createdBy, cmis:objectId, "
> +        "cmis:contentStreamLength FROM cmis:document "
> +        "WHERE cmis:name LIKE '%%%s%%'", file_name, repo)
> +    for result in results:
> +        info = result.getProperties()
> +        if info['cmis:contentStreamLength'] != 0:
> +            data_attach = {
> +                'name': info['cmis:name'],
> +                'owner': info['cmis:createdBy'],
> +                'file_id': info['cmis:objectId'],
> +                'wizard_id': wizard_id,
> +            }
> +        ir_attach_dms_obj.create(session.cr, session.uid, data_attach,
> +                                 context=session.context)

could be:
session.create('ir.attachment.dms', data_attach)

> +
> +
> +@job
> +def create_doc_from_dms(session, model_name, backend_id, data, name,
> +                        model, res_id, uid, filters=None):
> +    ir_attach_obj = session.pool.get('ir.attachment')
> +    ir_attach_dms_obj = session.pool.get('ir.attachment.dms')
> +    cmis_backend_obj = session.pool.get('cmis.backend')
> +    if session.context is None:
> +        session.context = {}

useless lines again

> +    # login with the cmis account
> +    repo = cmis_backend_obj._auth(
> +        session.cr, session.uid, context=session.context)
> +    for attach in ir_attach_dms_obj.browse(session.cr, session.uid,
> +                                           data['attachment_ids'],
> +                                           context=session.context):

could be:
session.browse('ir.attachment.dms', data['attachment_ids'])

> +        # Get results from id of document
> +        results = repo.query(" SELECT * FROM  cmis:document WHERE \
> +                             cmis:objectId ='" + attach.file_id + "'")
> +        for result in results:
> +            info = result.getProperties()
> +            data_attach = {
> +                'name': info['cmis:name'],
> +                'description': info['cmis:description'],
> +                'type': 'binary',
> +                'datas': result.getContentStream().read().encode('base64'),
> +                'res_model': model,
> +                'res_name': name,
> +                'res_id': res_id,
> +                'user_id': uid,
> +            }
> +            session.context['bool_testdoc'] = True

You should use:
with session.change_context({'bool_testdoc': True}):
    session.create('ir.attachment', data_attach)
rather than changing the session's context globally.

> +            ir_attach_obj.create(session.cr, session.uid,
> +                                 data_attach, context=session.context)
> +    return True
> +
> +# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
> 
> === added file 'cmis_read/wizard/document_wizard_view.xml'
> --- cmis_read/wizard/document_wizard_view.xml	1970-01-01 00:00:00 +0000
> +++ cmis_read/wizard/document_wizard_view.xml	2014-06-12 19:57:17 +0000
> @@ -0,0 +1,47 @@
> +<?xml version="1.0"?>
> +<openerp>
> +  <data>
> +
> +    <!-- wizard view -->
> +        <record id="wizard_view" model="ir.ui.view">
> +            <field name="name">Search Document</field>
> +            <field name="model">ir.attachment.dms.wizard</field>
> +            <field name="arch" type="xml">
> +                <form string="Search Document" version="7.0">
> +                   <div>
> +                        This action allows you to search by file name and to add the document you select
> +                   </div>
> +                   <group>
> +                      <div width="100%%">
> +                        <field  name="name" width="70%%" class="oe_inline"/>
> +                        <button name="search_doc" string="Search" type="object"
> +                                width="15%%" class="oe_inline oe_highlight" />
> +                      </div>
> +                   </group>
> +                    <field name="attachment_ids"/>
> +                    <footer>
> +                      <button name="action_apply" string="Apply" type="object"
> +                              class="oe_highlight"/>
> +                      or
> +                      <button special="cancel" string="Cancel" type="object"
> +                              class="oe_link"/>
> +                    </footer>
> +                </form>
> +            </field>
> +        </record>
> +
> +
> +    <record id="wizard_attachment_tree_view" model="ir.ui.view">
> +        <field name="name">Ir Attachment Dms</field>
> +        <field name="model">ir.attachment.dms</field>
> +        <field name="arch" type="xml">
> +            <tree string="Attachment" editable="bottom" create="false" delete="false">
> +                <field name="selectable_ok"/>
> +                <field name="name"/>
> +                <field name="owner"/>
> +            </tree>
> +        </field>
> +    </record>
> +
> +  </data>
> +</openerp>
> 


-- 
https://code.launchpad.net/~savoirfairelinux-openerp/knowledge-addons/cmis_read/+merge/212260
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/knowledge-addons/cmis_read.