From 06d8aade234f465046195cde1c0e5104a76a1df4 Mon Sep 17 00:00:00 2001
From: fliu <10025-fliu@users.noreply.salsa.debian.org>
Date: Sat, 21 Aug 2021 21:23:58 +0000
Subject: [PATCH] email: Fix self.critical not callable error

---
 plinth/modules/email_server/audit/models.py    | 18 +++++++++---------
 .../email_server/templates/email_server.html   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plinth/modules/email_server/audit/models.py b/plinth/modules/email_server/audit/models.py
index de4b3e77d..173e77630 100644
--- a/plinth/modules/email_server/audit/models.py
+++ b/plinth/modules/email_server/audit/models.py
@@ -19,7 +19,7 @@ class Diagnosis:
         """Class constructor"""
         self.title = title
         self.action = action
-        self.critical = []
+        self.critical_errors = []
         self.errors = []
 
     def to_json(self):
@@ -29,7 +29,7 @@ class Diagnosis:
             'title': self.title,
             'action': self.action,
             'errors': self.errors,
-            'critical': self.critical
+            'critical_errors': self.critical_errors
         }
 
     @classmethod
@@ -47,15 +47,15 @@ class Diagnosis:
             title = translate(title) or title
         result = cls(title, action=valid_dict['action'])
         result.errors.extend(valid_dict['errors'])
-        result.critical.extend(valid_dict['critical'])
+        result.critical_errors.extend(valid_dict['critical_errors'])
         return result
 
     def critical(self, message_fmt, *args):
         """Append a message to the critical errors list"""
         if args:
-            self.critical.append(message_fmt % args)
+            self.critical_errors.append(message_fmt % args)
         else:
-            self.critical.append(message_fmt)
+            self.critical_errors.append(message_fmt)
 
     def error(self, message_fmt, *args):
         """Append a message to the errors list"""
@@ -69,7 +69,7 @@ class Diagnosis:
         if log:
             self.write_logs()
 
-        if self.critical:
+        if self.critical_errors:
             return [self.title, 'error']
         elif self.errors:
             return [self.title, 'failed']
@@ -79,19 +79,19 @@ class Diagnosis:
     @property
     def has_failed(self):
         """True if the diagnosis has failed or contains an error"""
-        return (self.critical or self.errors)
+        return (self.critical_errors or self.errors)
 
     def write_logs(self):
         """Log errors and failures"""
         logger.debug('Ran audit: %s', self.title)
-        for message in self.critical:
+        for message in self.critical_errors:
             logger.critical(message)
         for message in self.errors:
             logger.error(message)
 
     def sorting_key(self):
         """The key function for list.sort"""
-        return (-len(self.critical), -len(self.errors), self.title)
+        return (-len(self.critical_errors), -len(self.errors), self.title)
 
 
 class MainCfDiagnosis(Diagnosis):
diff --git a/plinth/modules/email_server/templates/email_server.html b/plinth/modules/email_server/templates/email_server.html
index 78c1fd575..d4eab825f 100644
--- a/plinth/modules/email_server/templates/email_server.html
+++ b/plinth/modules/email_server/templates/email_server.html
@@ -21,7 +21,7 @@
         <li class="list-group-item clearfix">
 
           <span>{{ model.title }}</span>
-          {% if model.critical %}
+          {% if model.critical_errors %}
             <span class="badge badge-danger">{% trans "error" %}</span>
           {% elif model.errors %}
             <span class="badge badge-warning">{% trans "failed" %}</span>
@@ -41,7 +41,7 @@
           {% endif %}
 
           <ul>
-            {% for message in model.critical %}
+            {% for message in model.critical_errors %}
               <li>{{ message }}</li>
             {% endfor %}
             {% for message in model.errors %}