From: Michael Tremer Date: Mon, 12 Nov 2012 21:55:26 +0000 (+0100) Subject: Fix getting users of log messages. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d077f67aeca50ebcf3f523b2953be98da248ab6;p=pbs.git Fix getting users of log messages. --- diff --git a/backend/logs.py b/backend/logs.py index df3a90e2..043499ac 100644 --- a/backend/logs.py +++ b/backend/logs.py @@ -26,7 +26,12 @@ class LogEntry(base.Object): return self.data.time def get_user(self): - return None + user_id = getattr(self.data, "user_id", None) + + if user_id is None: + return + + return self.pakfire.users.get_by_id(self.data.user_id) @property def user(self): @@ -66,14 +71,6 @@ class CommentLogEntry(LogEntry): return "none" - def get_user(self): - user_id = getattr(self.data, "user_id", None) - - if user_id is None: - return - - return self.pakfire.users.get_by_id(self.data.user_id) - def get_message(self, user=None): return self.data.text @@ -275,10 +272,6 @@ class JobLogEntry(LogEntry): class MirrorLogEntry(LogEntry): type = "mirror" - def get_user(self): - if self.data.user_id: - return self.pakfire.users.get_by_id(self.data.user_id) - def get_mirror(self): assert self.data.mirror_id