Merge remote-tracking branch 'origin/Django' into Django

elastic/templates/elastic/users.html

@@ -407,8 +407,8 @@
                 users.forEach(user => {
                     const row = document.createElement('tr');
 
-                    // 根据权限值显示权限名称
-                    const permissionText = user.permission === 0 ? '管理员' : '普通用户';
+                // 根据权限值显示权限名称
+                const permissionText = Number(user.permission) === 0 ? '管理员' : '普通用户';
 
                     row.innerHTML = `
                         <td>${user.user_id}</td>
@@ -496,9 +496,9 @@
             let response;
 
             if (userId) {
-                // 更新用户
                 response = await fetch(`/elastic/users/${userId}/update/`, {
                     method: 'POST',
+                    credentials: 'same-origin',
                     headers: {
                         'Content-Type': 'application/json',
                         'X-CSRFToken': csrftoken
@@ -506,9 +506,9 @@
                     body: JSON.stringify(data)
                 });
             } else {
-                // 添加用户
                 response = await fetch('/elastic/users/add/', {
                     method: 'POST',
+                    credentials: 'same-origin',
                     headers: {
                         'Content-Type': 'application/json',
                         'X-CSRFToken': csrftoken
@@ -540,6 +540,7 @@
             const csrftoken = getCookie('csrftoken');
             const response = await fetch(`/elastic/users/${userId}/delete/`, {
                 method: 'POST',
+                credentials: 'same-origin',
                 headers: {
                     'Content-Type': 'application/json',
                     'X-CSRFToken': csrftoken