Skip to content
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

[16.0][FIX] base_user_locale: user can change own locale #993

Open
wants to merge 1 commit into
base: 16.0
Choose a base branch
from
+75 −66
Open

[16.0][FIX] base_user_locale: user can change own locale #993

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
11 changes: 11 additions & 0 deletions base_user_locale/models/res_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,17 @@ def SELF_READABLE_FIELDS(self):
]
return super().SELF_READABLE_FIELDS + base_user_locale_readable_fields

@property
def SELF_WRITEABLE_FIELDS(self):
base_user_locale_writeable_fields = [
"date_format",
"time_format",
"week_start",
"decimal_point",
"thousands_sep",
]
return super().SELF_WRITEABLE_FIELDS + base_user_locale_writeable_fields

def preference_save(self):
super().preference_save()
# Do a "full" reload instead of just a context_reload to apply locale
Expand Down
130 changes: 64 additions & 66 deletions base_user_locale/tests/test_base_user_locale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Copyright 2019 Brainbean Apps (https://brainbeanapps.com)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

from odoo.exceptions import AccessError
from odoo.tests.common import SavepointCase
from odoo.tools import mute_logger

from ..controllers.web_client import WebClient

Expand All @@ -14,13 +16,26 @@
cls.ResCompany = cls.env["res.company"]
cls.ResUsers = cls.env["res.users"]
cls.CalendarEvent = cls.env["calendar.event"]

cls.code = "en_US"
lang_name = "English (US)"
if not cls.env["res.lang"]._lang_get_id(cls.code):
cls.env["res.lang"].load_lang(cls.code, lang_name)
cls.env["res.lang"].load_lang(cls.code, "English (US)")

Check warning on line 22 in base_user_locale/tests/test_base_user_locale.py

View check run for this annotation

Codecov / codecov/patch

base_user_locale/tests/test_base_user_locale.py#L22 

Added line #L22 was not covered by tests

cls.company = cls.ResCompany.create({"name": "Company"})
cls.company.partner_id.lang = cls.code

cls.user = cls.ResUsers.with_context(no_reset_password=True).create(
{
"name": "User",
"login": "user",
"email": "[email protected]",
"company_id": cls.company.id,
"company_ids": [(4, cls.company.id)],
"lang": cls.code,
}
)

def test_uninstalled_lang(self):
company = self.ResCompany.create({"name": "Company"})
uninstalled_lang = (
self.env["res.lang"]
.with_context(active_test=True)
Expand All @@ -31,106 +46,89 @@
self.ResUsers.with_context(no_reset_password=True).create(
{
"name": "User",
"login": "user",
"login": "another user",
"email": "[email protected]",
"company_id": company.id,
"company_ids": [(4, company.id)],
"company_id": self.company.id,
"company_ids": [(4, self.company.id)],
"lang": uninstalled_lang.code,
}
)

def test_date_format(self):
company = self.ResCompany.create({"name": "Company"})
user = self.ResUsers.with_context(no_reset_password=True).create(
{
"name": "User",
"login": "user",
"email": "[email protected]",
"company_id": company.id,
"company_ids": [(4, company.id)],
"lang": self.code,
}
)
company.partner_id.lang = self.code
user.env.company = user.company_id
self.user.env.company = self.user.company_id

self.assertEqual(
self.CalendarEvent.with_user(user)._get_date_formats()[0], "%m/%d/%Y"
self.CalendarEvent.with_user(self.user)._get_date_formats()[0], "%m/%d/%Y"
)
lang_parameters = WebClient().get_user_lang_parameters(user)
lang_parameters = WebClient().get_user_lang_parameters(self.user)
self.assertEqual(lang_parameters, {})

company.date_format = "%d %b %Y"
self.company.date_format = "%d %b %Y"
self.assertEqual(
self.CalendarEvent.with_user(user)._get_date_formats()[0], "%d %b %Y"
self.CalendarEvent.with_user(self.user)._get_date_formats()[0], "%d %b %Y"
)
lang_parameters = WebClient().get_user_lang_parameters(user)
lang_parameters = WebClient().get_user_lang_parameters(self.user)
self.assertEqual(lang_parameters, {"date_format": "%d %b %Y"})

user.date_format = "%d/%b/%Y"
self.user.date_format = "%d/%b/%Y"
self.assertEqual(
self.CalendarEvent.with_user(user)._get_date_formats()[0], "%d/%b/%Y"
self.CalendarEvent.with_user(self.user)._get_date_formats()[0], "%d/%b/%Y"
)
lang_parameters = WebClient().get_user_lang_parameters(user)
lang_parameters = WebClient().get_user_lang_parameters(self.user)
self.assertEqual(lang_parameters, {"date_format": "%d/%b/%Y"})

def test_time_format(self):
company = self.ResCompany.create({"name": "Company"})
user = self.ResUsers.with_context(no_reset_password=True).create(
{
"name": "User",
"login": "user",
"email": "[email protected]",
"company_id": company.id,
"company_ids": [(4, company.id)],
"lang": self.code,
}
)
company.partner_id.lang = self.code
user.env.company = user.company_id
self.user.env.company = self.user.company_id

self.assertEqual(
self.CalendarEvent.with_user(user)._get_date_formats()[1], "%H:%M:%S"
self.CalendarEvent.with_user(self.user)._get_date_formats()[1], "%H:%M:%S"
)
lang_parameters = WebClient().get_user_lang_parameters(user)
lang_parameters = WebClient().get_user_lang_parameters(self.user)
self.assertEqual(lang_parameters, {})

company.time_format = "%H.%M.%S"
self.company.time_format = "%H.%M.%S"
self.assertEqual(
self.CalendarEvent.with_user(user)._get_date_formats()[1], "%H.%M.%S"
self.CalendarEvent.with_user(self.user)._get_date_formats()[1], "%H.%M.%S"
)
lang_parameters = WebClient().get_user_lang_parameters(user)
lang_parameters = WebClient().get_user_lang_parameters(self.user)
self.assertEqual(lang_parameters, {"time_format": "%H.%M.%S"})

user.time_format = "%I:%M%p"
self.user.time_format = "%I:%M%p"
self.assertEqual(
self.CalendarEvent.with_user(user)._get_date_formats()[1], "%I:%M%p"
self.CalendarEvent.with_user(self.user)._get_date_formats()[1], "%I:%M%p"
)
lang_parameters = WebClient().get_user_lang_parameters(user)
lang_parameters = WebClient().get_user_lang_parameters(self.user)
self.assertEqual(lang_parameters, {"time_format": "%I:%M%p"})

def test_week_start(self):
company = self.ResCompany.create({"name": "Company"})
user = self.ResUsers.with_context(no_reset_password=True).create(
{
"name": "User",
"login": "user",
"email": "[email protected]",
"company_id": company.id,
"company_ids": [(4, company.id)],
"lang": self.code,
}
)
company.partner_id.lang = self.code
user.env.company = user.company_id
self.user.env.company = self.user.company_id

lang_parameters = WebClient().get_user_lang_parameters(user)
lang_parameters = WebClient().get_user_lang_parameters(self.user)
self.assertEqual(lang_parameters, {})

company.week_start = "4"
lang_parameters = WebClient().get_user_lang_parameters(user)
self.company.week_start = "4"
lang_parameters = WebClient().get_user_lang_parameters(self.user)
self.assertEqual(lang_parameters, {"week_start": 4})

user.week_start = "2"
lang_parameters = WebClient().get_user_lang_parameters(user)
self.user.week_start = "2"
lang_parameters = WebClient().get_user_lang_parameters(self.user)
self.assertEqual(lang_parameters, {"week_start": 2})

@mute_logger("odoo.addons.base.models.ir_model")
def test_user_can_write_own_fields(self):
self.user.env.company = self.user.company_id

vals = {
"date_format": "%d/%b/%Y",
"time_format": "%H.%M.%S",
"week_start": "1",
"decimal_point": ".",
"thousands_sep": ",",
}

self.user.with_user(self.user.id).write(vals)

admin_with_user = self.env.ref("base.user_admin").with_user(self.user.id)
for field, value in vals.items():
with self.assertRaises(AccessError, msg=f"failed for field {field}"):
admin_with_user.write({field: value})
Loading