Skip to content

Commit

Permalink
Merge fcc3ab2 into 2960cd5
Browse files Browse the repository at this point in the history
  • Loading branch information
ernestotejeda committed May 22, 2019
2 parents 2960cd5 + fcc3ab2 commit 30fb347
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
4 changes: 0 additions & 4 deletions project_key/hooks.py
Expand Up @@ -6,7 +6,3 @@ def post_init_hook(cr, registry):
from odoo import api, SUPERUSER_ID
env = api.Environment(cr, SUPERUSER_ID, {})
env['project.project']._set_default_project_key()
cr.execute(
"ALTER TABLE project_project ALTER COLUMN key SET NOT NULL",
log_exceptions=False
)
8 changes: 8 additions & 0 deletions project_key/models/project_project.py
Expand Up @@ -3,6 +3,7 @@

from odoo import models, fields, api, _
from odoo.osv import expression
from odoo.tools import config


class Project(models.Model):
Expand Down Expand Up @@ -131,9 +132,16 @@ def _prepare_sequence_data(self, init=True):
return values

def get_next_task_key(self):
test_project_key = self.env.context.get('test_project_key')
if config['test_enable'] and not test_project_key:
return False
return self.sudo().task_key_sequence_id.next_by_id()

def generate_project_key(self, text):
test_project_key = self.env.context.get('test_project_key')
if config['test_enable'] and not test_project_key:
return False

if not text:
return ''

Expand Down
6 changes: 4 additions & 2 deletions project_key/tests/test_common.py
Expand Up @@ -9,8 +9,10 @@ class TestCommon(TransactionCase):
def setUp(self):
super(TestCommon, self).setUp()

self.Project = self.env['project.project']
self.Task = self.env['project.task']
self.Project = self.env['project.project'].with_context(
test_project_key=True)
self.Task = self.env['project.task'].with_context(
test_project_key=True)

self.project_action = self.ref("project.open_view_project_all_config")
self.task_action = self.ref("project.action_view_task")
Expand Down

0 comments on commit 30fb347

Please sign in to comment.