-
Notifications
You must be signed in to change notification settings - Fork 17
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.
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
Merge menu_item_rename and user_group_rename into same module #46
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8337875
Merge menu_item_rename and user_group_rename into same module
ddufresne aad0294
Refactor to prevent duplicate code
ddufresne 2010507
Merge branch '12.0' into 12.0-base_xml_rename
ddufresne a490489
Add a seperate mixin instead of extending base
ddufresne ce8a9e6
Merge branch '12.0-base_xml_rename' of github.com:Numigi/odoo-base-ad…
ddufresne 8acf10a
Update res_groups.py
ddufresne File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,6 @@ | |
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). | ||
|
||
from . import ( | ||
base, | ||
ir_ui_menu, | ||
res_groups, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
# © 2019 Numigi (tm) and all its contributors (https://bit.ly/numigiens) | ||
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). | ||
|
||
import logging | ||
from odoo import api, models | ||
from odoo.exceptions import ValidationError | ||
|
||
|
||
_logger = logging.getLogger(__name__) | ||
|
||
|
||
def is_lang_installed(env: 'Environment', lang: str): | ||
return lang in dict(env['res.lang'].get_installed()) | ||
|
||
|
||
class Base(models.AbstractModel): | ||
|
||
_inherit = 'base' | ||
|
||
@api.model | ||
def rename(self, ref, lang, value, field='name'): | ||
"""Rename the record to rename. | ||
|
||
:param ref: the XML ID of the record to rename | ||
:param lang: the language of the term | ||
:param value: the new name for the record | ||
""" | ||
if not is_lang_installed(self.env, lang): | ||
_logger.debug( | ||
'Skip renaming the record {ref} for the language {lang}. ' | ||
'The language is not installed.' | ||
.format(ref=ref, lang=lang) | ||
) | ||
return | ||
|
||
_logger.info( | ||
'Renaming the record {ref} with the label `{value}` ' | ||
'for the language {lang}.' | ||
.format(ref=ref, lang=lang, value=value) | ||
) | ||
record = self.env.ref(ref) | ||
if record._name != self._name: | ||
raise ValidationError( | ||
'The XML ID {ref} does not reference a record of model {model}. ' | ||
'It references a record of model {record_model}' | ||
.format(ref=ref, model=self._name, record_model=record._name) | ||
) | ||
|
||
record.with_context(lang=lang).write({field: value}) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,48 +1,22 @@ | ||
# © 2019 Numigi (tm) and all its contributors (https://bit.ly/numigiens) | ||
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). | ||
|
||
import logging | ||
from odoo import api, models | ||
from odoo.exceptions import ValidationError | ||
from .common import is_lang_installed, rename_record | ||
|
||
|
||
_logger = logging.getLogger(__name__) | ||
from .base import is_lang_installed | ||
|
||
|
||
class IrUiMenu(models.Model): | ||
|
||
_inherit = 'ir.ui.menu' | ||
|
||
@api.model | ||
def rename(self, menu_ref, lang, value): | ||
"""Rename the menu item. | ||
|
||
:param menu_ref: the XML ID of the menu item | ||
:param lang: the language of the menu entry | ||
:param value: the new name for the menu entry | ||
""" | ||
if not is_lang_installed(self.env, lang): | ||
_logger.debug( | ||
'Skip renaming menu item {menu_ref} for the language {lang}. ' | ||
'The language is not installed.' | ||
.format(menu_ref=menu_ref, lang=lang) | ||
) | ||
return | ||
def rename(self, ref, lang, value, field='name'): | ||
super().rename(ref, lang, value, field) | ||
|
||
_logger.info( | ||
'Renaming menu item {menu_ref} with the label `{value}` ' | ||
'for the language {lang}.' | ||
.format(menu_ref=menu_ref, lang=lang, value=value) | ||
menu = self.env.ref(ref) | ||
should_update_action_name = ( | ||
is_lang_installed(self.env, lang) and | ||
menu.action and field == 'name' | ||
) | ||
menu = self.env.ref(menu_ref) | ||
if menu._name != self._name: | ||
raise ValidationError( | ||
'The XML ID {} does not reference a menu item.' | ||
.format(menu_ref) | ||
) | ||
|
||
rename_record(menu, lang, value) | ||
|
||
if menu.action: | ||
rename_record(menu.action, lang, value) | ||
if should_update_action_name: | ||
menu.action.with_context(lang=lang).name = value |
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ça me parait limite de rajouter ça dans base. En fait, c'est le nom de la fonction qui me parait assez générique pour que potentiellement un autre module implement la même fonction.
Qu'est ce que tu en penses ?
Potentiellement, faire de la composition plutôt que de l'héritage. Ça pourrait réduire les risques.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
en effet, ça pourrait être un mixin
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@foutoucour done