Skip to content

Commit

Permalink
[FIX] OCA reviews
Browse files Browse the repository at this point in the history
  • Loading branch information
mourad-ehm authored and mart-e committed Oct 30, 2017
1 parent 9ade1d2 commit 3e6a8e3
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
15 changes: 13 additions & 2 deletions keychain/models/keychain_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# © 2016 Akretion Sebastien Beau
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from odoo import models, fields
from odoo import api, fields, models
from odoo.tools.config import config


Expand All @@ -17,19 +17,25 @@ class KeychainBackend(models.AbstractModel):
required=True)
data = fields.Serialized(
compute="_compute_keychain",
inverse="_inverse_keychain")
inverse="_inverse_keychain",
help="Additionnal data as json")

@api.multi
def _get_technical_name(self):
self.ensure_one()
return '%s,%s' % (self._name, self.id)

@api.multi
def _get_existing_keychain(self):
self.ensure_one()
return self.env['keychain.account'].retrieve([
('namespace', '=', self._backend_name),
('technical_name', '=', self._get_technical_name())
])

@api.multi
def _prepare_keychain(self):
self.ensure_one()
env = config.get('running_env')
return {
'name': "%s %s" % (self.name, env),
Expand All @@ -38,6 +44,7 @@ def _prepare_keychain(self):
'environment': env,
}

@api.multi
def _get_keychain_account(self):
self.ensure_one()
account = self._get_existing_keychain()
Expand All @@ -46,12 +53,14 @@ def _get_keychain_account(self):
account = self.env['keychain.account'].create(vals)
return account

@api.multi
def _inverse_password(self):
for record in self:
account = self._get_keychain_account()
if record.password and record.password != '******':
account.clear_password = record.password

@api.multi
def _compute_password(self):
for record in self:
account = record._get_existing_keychain()
Expand All @@ -60,11 +69,13 @@ def _compute_password(self):
else:
record.password = ""

@api.multi
def _inverse_keychain(self):
for record in self:
account = record._get_keychain_account()
account.data = account._serialize_data(record.data)

@api.multi
def _compute_keychain(self):
for record in self:
account = record._get_existing_keychain()
Expand Down
2 changes: 1 addition & 1 deletion keychain/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from . import test_keychain
from . import test_keychain_backend
from . import test_keychain_backend
1 change: 0 additions & 1 deletion keychain/tests/test_keychain_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,3 @@ def test_keychain_bakend(self):
self.assertEqual(
account.technical_name, '%s,%s' % (backend._name, backend.id),
'Account technical_name is not correct')

4 changes: 2 additions & 2 deletions keychain/views/keychain_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<field name="model">keychain.account</field>
<field name="arch" type="xml">

<tree string="Accounts">
<tree>
<field name="namespace"/>
<field name="name"/>
<field name="technical_name" />
Expand All @@ -18,7 +18,7 @@
<record model="ir.ui.view" id="keychain_account_form">
<field name="model">keychain.account</field>
<field name="arch" type="xml">
<form string="Accounts form">
<form>
<group>
<field name="namespace"/>
<field name="name" />
Expand Down

0 comments on commit 3e6a8e3

Please sign in to comment.