Merge branch 'master' into 12.0

haiwen · Jun 7, 2024 · a3a7734 · a3a7734
2 parents 18dbe93 + f2311b9
commit a3a7734
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/seahub/base/accounts.py b/seahub/base/accounts.py
@@ -698,10 +698,10 @@ def freeze_user(self, notify_admins=False, notify_org_admins=False):
 
                 send_html_email_with_dj_template(email2contact_email(u.email),
                                                  subject=_('Account %(account)s froze on %(site)s.') % {
-                                                     "account": self.email,
+                                                     "account": email2contact_email(self.email),
                                                      "site": get_site_name()},
                                                  dj_template='sysadmin/user_freeze_email.html',
-                                                 context={'user': self.email})
+                                                 context={'user': email2contact_email(self.email)})
 
                 # restore current language
                 translation.activate(cur_language)
@@ -729,10 +729,10 @@ def freeze_user(self, notify_admins=False, notify_org_admins=False):
 
                 send_html_email_with_dj_template(email2contact_email(u.email),
                                                  subject=_('Account %(account)s froze on %(site)s.') % {
-                                                     "account": self.email,
+                                                     "account": email2contact_email(self.email),
                                                      "site": get_site_name()},
                                                  dj_template='sysadmin/user_freeze_email.html',
-                                                 context={'user': self.email})
+                                                 context={'user': email2contact_email(self.email)})
 
                 # restore current language
                 translation.activate(cur_language)

diff --git a/seahub/help/templates/help/base.html b/seahub/help/templates/help/base.html
@@ -101,7 +101,9 @@ <h3 class="hd">{% trans "Security and encryption" %}</h3>
             </ul>
         </div>
     </div>
-    <div class="help-con article col-md-9 ov-auto flex-1" id="right-panel">{% block help_con %}{% endblock %}</div>
+    <div class="help-con article col-md-9 ov-auto flex-1 h100" id="right-panel">
+      {% block help_con %}{% endblock %}
+    </div>
 </div>
 {% endblock %}