From d19aef2e94e497a62c299fb4026efecdb49c7e48 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Thu, 27 Aug 2020 01:36:02 +0300 Subject: [PATCH] Disable tags actions in moderation dropdown when TagPolicy is disabled --- src/store/modules/users.js | 10 +++++----- src/views/users/components/ModerationDropdown.vue | 9 +++++++++ src/views/users/index.vue | 5 +++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/store/modules/users.js b/src/store/modules/users.js index e0aa59d6..51e01b6d 100644 --- a/src/store/modules/users.js +++ b/src/store/modules/users.js @@ -26,7 +26,7 @@ const users = { fetchedUsers: [], loading: true, searchQuery: '', - tagPolicyEnabled: true, + tagPolicyDisabled: false, totalUsersCount: 0, currentPage: 1, pageSize: 50, @@ -80,8 +80,8 @@ const users = { SET_SEARCH_QUERY: (state, query) => { state.searchQuery = query }, - SET_TAG_POLICY: (state, policyEnabled) => { - state.tagPolicyEnabled = policyEnabled + SET_TAG_POLICY: (state, policyDisabled) => { + state.tagPolicyDisabled = policyDisabled }, SET_USERS_FILTERS: (state, filters) => { state.filters = filters @@ -213,12 +213,12 @@ const users = { }, async FetchTagPolicySetting({ commit, getters }) { const { data } = await fetchSettings(getters.authHost, getters.token) - const tagPolicyEnabled = data.configs + const tagPolicyDisabled = !data.configs .find(el => el.key === ':mrf').value .find(el => el.tuple[0] === ':policies').tuple[1] .includes('Pleroma.Web.ActivityPub.MRF.TagPolicy') - commit('SET_TAG_POLICY', tagPolicyEnabled) + commit('SET_TAG_POLICY', tagPolicyDisabled) }, async FetchUsers({ commit, dispatch, getters, state }, { page }) { commit('SET_LOADING', true) diff --git a/src/views/users/components/ModerationDropdown.vue b/src/views/users/components/ModerationDropdown.vue index fd6ba5a3..05f57b44 100644 --- a/src/views/users/components/ModerationDropdown.vue +++ b/src/views/users/components/ModerationDropdown.vue @@ -68,6 +68,7 @@ {{ $t('users.resendConfirmation') }} @@ -75,18 +76,21 @@ {{ $t('users.stripMedia') }} {{ $t('users.forceUnlisted') }} {{ $t('users.sandbox') }} @@ -94,6 +98,7 @@ {{ $t('users.disableRemoteSubscription') }} @@ -101,6 +106,7 @@ {{ $t('users.disableAnySubscription') }} @@ -161,6 +167,9 @@ export default { }, isDesktop() { return this.$store.state.app.device === 'desktop' + }, + tagPolicyDisabled() { + return this.$store.state.users.tagPolicyDisabled } }, methods: { diff --git a/src/views/users/index.vue b/src/views/users/index.vue index bd4ebb0a..9504b299 100644 --- a/src/views/users/index.vue +++ b/src/views/users/index.vue @@ -276,6 +276,11 @@ export default { margin: 7px 0 0 15px; } } +.active-tag.is-disabled { + .el-icon-check { + color: #bbb; + } +} .el-dropdown-link:hover { cursor: pointer; color: #409EFF;