use contact email as webdav username

haiwen · Dec 11, 2024 · 6599ab8 · 6599ab8
1 parent 4c231ea
commit 6599ab8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/frontend/src/components/user-settings/webdav-password.js b/frontend/src/components/user-settings/webdav-password.js
@@ -8,7 +8,7 @@ import SetWebdavPassword from '../dialog/set-webdav-password';
 import ResetWebdavPassword from '../dialog/reset-webdav-password';
 import RemoveWebdavPassword from '../dialog/remove-webdav-password';
 
-const { username, webdavUrl, webdavPasswordSetted } = window.app.pageOptions;
+const { contactEmail, webdavUrl, webdavPasswordSetted } = window.app.pageOptions;
 
 class WebdavPassword extends React.Component {
 
@@ -92,7 +92,7 @@ class WebdavPassword extends React.Component {
         <div id="update-webdav-passwd" className="setting-item">
           <h3 className="setting-item-heading">{gettext('WebDAV Access')}</h3>
           <p>WebDAV URL: <a href={webdavUrl}>{webdavUrl}</a></p>
-          <p>{gettext('WebDAV username:')} {username}</p>
+          <p>{gettext('WebDAV username:')} {contactEmail}</p>
           {!isWebdavPasswordSetted ?
             <React.Fragment>
               <p>{gettext('WebDAV password:')} {gettext('not set')}</p>

diff --git a/seahub/profile/templates/profile/set_profile_react.html b/seahub/profile/templates/profile/set_profile_react.html
@@ -13,6 +13,7 @@
 // overwrite the one in base_for_react.html
 window.app.pageOptions = {
   username: "{{request.user.username|escapejs}}",
+  contactEmail: "{{request.user.username|email2contact_email|escapejs}}",
   avatarURL: '{% avatar_url request.user %}',
   csrfToken: '{{ csrf_token }}',