Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion auditlog/models/http_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ class AuditlogHTTPRequest(models.Model):
@api.depends("create_date", "name")
def _compute_display_name(self):
for httprequest in self:
create_date = fields.Datetime.from_string(httprequest.create_date)
create_date = (
fields.Datetime.from_string(httprequest.create_date)
or fields.Datetime.now()
)
tz_create_date = fields.Datetime.context_timestamp(httprequest, create_date)
httprequest.display_name = "{} ({})".format(
httprequest.name or "?", fields.Datetime.to_string(tz_create_date)
Expand Down
5 changes: 4 additions & 1 deletion auditlog/models/http_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ class AuditlogtHTTPSession(models.Model):
@api.depends("create_date", "user_id")
def _compute_display_name(self):
for httpsession in self:
create_date = fields.Datetime.from_string(httpsession.create_date)
create_date = (
fields.Datetime.from_string(httpsession.create_date)
or fields.Datetime.now()
)
tz_create_date = fields.Datetime.context_timestamp(httpsession, create_date)
httpsession.display_name = "{} ({})".format(
httpsession.user_id and httpsession.user_id.name or "?",
Expand Down
1 change: 1 addition & 0 deletions auditlog/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
from . import common
from . import test_auditlog
from . import test_autovacuum
from . import test_http
44 changes: 44 additions & 0 deletions auditlog/tests/test_http.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo.tests.common import HttpCase, tagged


@tagged("post_install", "-at_install")
class TestAuditlogHttp(HttpCase):
def test_compute_display_name(self):
self.authenticate("admin", "admin")
rule = self.env["auditlog.rule"].create(
{
"name": "res.partner",
"model_id": self.env.ref("base.model_res_partner").id,
"log_type": "full",
"state": "subscribed",
}
)
self.addCleanup(rule.unsubscribe)
partner = self.env.ref("base.partner_demo")
self.make_jsonrpc_request(
"/web/dataset/call_kw",
params={
"model": "res.partner",
"method": "write",
"args": [partner.id, {"name": "test"}],
"kwargs": {},
},
headers={
"Cookie": f"session_id={self.session.sid};",
},
)
logs = self.env["auditlog.log"].search(
[("model_id", "=", rule.model_id.id), ("res_id", "=", partner.id)]
)
self.assertEqual(len(logs), 1)
http_request_id = logs[0]["http_request_id"]
self.assertRegex(
http_request_id.display_name,
r"/web/dataset/call_kw \(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\)",
)
http_session_id = logs[0]["http_session_id"]
self.assertRegex(
http_session_id.display_name,
r"Mitchell Admin \(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\)",
)