Merge branch 'admin-users' into shigusegubu-themes3

src/components/moderation_tools/moderation_tools.js

@@ -407,16 +407,13 @@ const ModerationTools = {
     },
     isAdmin() {
       this.$store.state.users.currentUser.role === 'admin'
-    }
+    },
   },
   methods: {
     canGrantRole(name, value) {
       const setEntry = `${value ? '!' : ''}rights:${name}`
 
-      return (
+      return this.isAdmin && this.totalSet.has(setEntry)
-        this.isAdmin &&
-        this.totalSet.has(setEntry)
-      )
     },
     canChangeState(name, value) {
       const setEntry = `${value ? '!' : ''}state:${name}`

src/components/settings_modal/admin_tabs/users_tab.js

@@ -103,11 +103,10 @@ const UsersTab = {
   },
   methods: {
     fetchUsers(page) {
-      return useAdminSettingsStore()
+      return useAdminSettingsStore().fetchUsers({
-        .fetchUsers({
+        ...this.fetchOptions,
-          ...this.fetchOptions,
+        page,
-          page,
+      })
-        })
     },
   },
   watch: {

src/components/settings_modal/settings_modal.js

@@ -277,7 +277,7 @@ const SettingsModal = {
   watch: {
     $route(r) {
       this.minimizeModal()
-    }
+    },
   },
 }
 

src/components/user_profile/user_profile_admin_view.js

@@ -45,7 +45,7 @@ const UserProfileAdminView = {
     },
     userId() {
       return this.$route.params.id
-    }
+    },
   },
   methods: {
     fetchStatuses(page) {

src/modules/statuses.js

@@ -822,7 +822,9 @@ const statuses = {
             'addNewUsers',
             data.statuses.map((s) => s.user).filter((u) => u),
           )
-          data.statuses = store.commit('addNewStatuses', { statuses: data.statuses })
+          data.statuses = store.commit('addNewStatuses', {
+            statuses: data.statuses,
+          })
           return data
         })
     },

src/stores/interface.js

@@ -161,7 +161,9 @@ export const useInterfaceStore = defineStore('interface', {
         case 'hidden':
           return
         default:
-          throw new Error(`Illegal minimization state of settings modal: ${this.settingsModalState}`)
+          throw new Error(
+            `Illegal minimization state of settings modal: ${this.settingsModalState}`,
+          )
       }
     },
     clearSettingsModalTargetTab() {