Skip to content

[MIG] Migrate module attachment_base_synchronize to v10 #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lasley merged 1 commit into from
Jul 7, 2017
Merged

[MIG] Migrate module attachment_base_synchronize to v10 #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions attachment_base_synchronize/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
Expand All @@ -22,15 +21,15 @@ An example of the use of this module, can be found in the external_file_location
Usage
=====

Go the menu Settings > Attachments
Go the menu Settings > Technical > Database Structure > Meta Data Attachments

@cmsalmeida cmsalmeida Jun 14, 2017

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


You can create / see standard attachments with additional fields



.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
:target: https://runbot.odoo-community.org/runbot/149/8.0
:target: https://runbot.odoo-community.org/runbot/149/10.0


Known issues / Roadmap
Expand All @@ -43,13 +42,9 @@ Bug Tracker
===========

Bugs are tracked on `GitHub Issues
<https://github.com/OCA/server-tools/issues>`_. In case of trouble, please
<https://github.com/OCA/{project_repo}/issues>`_. In case of trouble, please
check there if your issue has already been reported. If you spotted it first,
help us smashing it by providing a detailed and welcomed `feedback
<https://github.com/OCA/
server-tools/issues/new?body=module:%20
attachment_metadata%0Aversion:%20
8.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
help us smash it by providing detailed and welcomed feedback.

Credits
=======
Expand All @@ -64,9 +59,7 @@ Contributors
------------

* Valentin CHEMIERE <valentin.chemiere@akretion.com>
* Sebastien BEAU <sebastian.beau@akretion.com>
* Joel Grand-Guillaume Camptocamp
* initOS <http://initos.com>
* Florian da Costa <florian.dacosta@akretion.com>
* Angel Moya <http://angelmoya.es>

Maintainer
Expand Down
4 changes: 2 additions & 2 deletions attachment_base_synchronize/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
'name': 'Attachment Base Synchronize',
'version': '9.0.1.0.0',
'version': '10.0.1.0.0',
'author': 'Akretion,Odoo Community Association (OCA)',
'website': 'www.akretion.com',
'license': 'AGPL-3',
Expand All @@ -21,7 +21,7 @@
'demo': [
'demo/attachment_metadata_demo.xml'
],
'installable': False,
'installable': True,
'application': False,
'images': [],
}
6 changes: 2 additions & 4 deletions attachment_base_synchronize/data/cron.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data noupdate="1">
<odoo noupdate="1">

<record model="ir.cron" id="cronjob_run_attachments_metadata">
<field name='name'>Run Attachments Metadata</field>
Expand All @@ -14,5 +13,4 @@
<field name="args">([])</field>
</record>

</data>
</openerp>
</odoo>
6 changes: 2 additions & 4 deletions attachment_base_synchronize/demo/attachment_metadata_demo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<odoo noupdate="1">

<record id="attachment_metadata" model="ir.attachment.metadata">
<field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
<field name="datas_fname">attachment_metadata.doc</field>
<field name="name">attachment_metadata.doc</field>
</record>

</data>
</openerp>
</odoo>
20 changes: 12 additions & 8 deletions attachment_base_synchronize/models/attachment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
# @ 2015 Florian DA COSTA @ Akretion
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from openerp import models, fields, api, _
from openerp.exceptions import Warning as UserError
import openerp
import hashlib
from base64 import b64decode
import hashlib
import logging
import odoo
from odoo import _, api, fields, models
from odoo.exceptions import UserError


_logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -56,8 +57,7 @@ def _compute_hash(self):
@api.model
def run_attachment_metadata_scheduler(self, domain=None):
if domain is None:
domain = []
domain.append(('state', '=', 'pending'))
domain = [('state', '=', 'pending')]

@Garamotte Garamotte Jun 9, 2017

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you really want to change the behaviour here ?
The ('state', '=', 'pending') tuple is now only added in the domain when the domain was None, instead of being always added like before.

A unit test calling this method with a domain in arguments would be fine.

@florian-dacosta florian-dacosta Jun 12, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is wanted indeed.
The normal way is to just run the attachment at pending state, so the cron does not need any argument. But one can make a cron only with attachment at 'failed' state for instance.
So the idea is that we can ignore the generic domain ('state', '=', 'pending') for more flexibility.

@lasley lasley Jul 5, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @florian-dacosta on this one. An alternative to changing the behavior is to use a context override to stop the hard coded domain, but IMO explicitly adding is better than explicitly removing.

attachments = self.search(domain)
if attachments:
return attachments.run()
Expand All @@ -70,7 +70,7 @@ def run(self):
"""
for attachment in self:
with api.Environment.manage():
with openerp.registry(self.env.cr.dbname).cursor() as new_cr:
with odoo.registry(self.env.cr.dbname).cursor() as new_cr:
new_env = api.Environment(
new_cr, self.env.uid, self.env.context)
attach = attachment.with_env(new_env)
Expand All @@ -86,7 +86,11 @@ def run(self):
})
attach.env.cr.commit()
else:
attach.write({'state': 'done'})
vals = {
'state': 'done',
'sync_date': fields.Datetime.now(),
}
attach.write(vals)
attach.env.cr.commit()
return True

Expand Down
3 changes: 2 additions & 1 deletion attachment_base_synchronize/security/ir.model.access.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_attachment_metadata_user,ir.attachment.metadata.user,model_ir_attachment_metadata,base.group_user,1,0,0,0
access_attachment_metadata_user,ir.attachment.metadata.user,model_ir_attachment_metadata,,1,0,0,0
access_attachment_metadata_user,ir.attachment.metadata.user,model_ir_attachment_metadata,base.group_no_one,1,1,1,1

@cmsalmeida cmsalmeida Jun 14, 2017 •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They have same key, I've fixed that in #856 because it needed to pass tests.

@lasley lasley Jul 5, 2017 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the change you are recommending that @florian-dacosta perform here?

Edit: (sorry for the accidental ping @sylvain-garancher)

@florian-dacosta florian-dacosta Jul 6, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lasley There is a mistake because 2 security rules have the same id. @cmsalmeida fixed it in the PR of external_file_location migration. I guess it is enought, as for now external_file_location is the only module depending on this one.

@lasley lasley Jul 7, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the elaboration @florian-dacosta. Works for me too!

12 changes: 8 additions & 4 deletions attachment_base_synchronize/tests/test_attachment_base_synchronize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Copyright 2016 Angel Moya (http://angelmoya.es)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from openerp.tests.common import TransactionCase
import openerp
from openerp import api
from odoo.tests.common import TransactionCase
import odoo
from odoo import api


class TestAttachmentBaseSynchronize(TransactionCase):
Expand All @@ -31,7 +31,7 @@ def test_attachment_metadata(self):
)
self.ir_attachment_metadata.run_attachment_metadata_scheduler()
self.env.invalidate_all()
with openerp.registry(self.env.cr.dbname).cursor() as new_cr:
with odoo.registry(self.env.cr.dbname).cursor() as new_cr:
new_env = api.Environment(
new_cr, self.env.uid, self.env.context)
attach = self.attachment.with_env(new_env)
Expand All @@ -43,6 +43,10 @@ def test_attachment_metadata(self):
def test_set_done(self):
"""Test set_done manually
"""
self.assertEqual(
self.attachment.state,
'pending'
)
self.attachment.set_done()
self.assertEqual(
self.attachment.state,
Expand Down
6 changes: 2 additions & 4 deletions attachment_base_synchronize/views/attachment_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<odoo>

<record id="view_attachment_improved_form" model="ir.ui.view">
<field name="model">ir.attachment.metadata</field>
Expand Down Expand Up @@ -108,5 +107,4 @@
sequence="20"
action="action_attachment"/>

</data>
</openerp>
</odoo>