From 065efcab7f757f3f4d20109e88909dd77c15f236 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Tue, 28 Jul 2020 21:04:21 +0300 Subject: [PATCH 1/3] Enable active and local filters on users tab by default --- src/views/users/components/UsersFilter.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/users/components/UsersFilter.vue b/src/views/users/components/UsersFilter.vue index 7b3bf55b..01bd384e 100644 --- a/src/views/users/components/UsersFilter.vue +++ b/src/views/users/components/UsersFilter.vue @@ -21,7 +21,7 @@ export default { data() { return { - value: [] + value: ['local', 'active'] } }, computed: { @@ -29,6 +29,10 @@ export default { return this.$store.state.app.device === 'desktop' } }, + created() { + const currentFilters = this.$data.value.reduce((acc, filter) => ({ ...acc, [filter]: true }), {}) + this.$store.dispatch('ToggleUsersFilter', currentFilters) + }, methods: { removeOppositeFilters() { const filtersQuantity = Object.keys(this.$store.state.users.filters).length From b3423fcf85ddd9734fe91eeeac0e59937e90b8ed Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Tue, 28 Jul 2020 21:32:40 +0300 Subject: [PATCH 2/3] Fix styles --- src/views/reports/components/Report.vue | 4 ---- src/views/users/index.vue | 22 ++++++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/views/reports/components/Report.vue b/src/views/reports/components/Report.vue index 4db70a6d..116887a8 100644 --- a/src/views/reports/components/Report.vue +++ b/src/views/reports/components/Report.vue @@ -245,10 +245,6 @@ export default { .el-icon-arrow-right { margin-right: 6px; } - .el-icon-close { - padding: 10px 5px 10px 10px; - cursor: pointer; - } .id { color: gray; margin-top: 6px; diff --git a/src/views/users/index.vue b/src/views/users/index.vue index c5671009..c8ea487b 100644 --- a/src/views/users/index.vue +++ b/src/views/users/index.vue @@ -329,16 +329,18 @@ export default { flex-direction: column; margin: 0 10px } - .el-tag { - width: 30px; - display: inline-block; - margin-bottom: 4px; - font-weight: bold; - &.el-tag--success { - padding-left: 8px; - } - &.el-tag--danger { - padding-left: 8px; + .el-table__row { + .el-tag { + width: 30px; + display: inline-block; + margin-bottom: 4px; + font-weight: bold; + &.el-tag--success { + padding-left: 8px; + } + &.el-tag--danger { + padding-left: 8px; + } } } .reboot-button { From a5b74ef396b02f9036a8ab0e2dbf9803e2edb25a Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Tue, 28 Jul 2020 21:34:50 +0300 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a53ed8f..116b247e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Move rendering Crontab setting from a separate component to EditableKeyword component - Show only those MRF settings that have been enabled in MRF Policies setting - Move Auto Linker settings to Link Formatter Tab as its configuration was moved to :pleroma, Pleroma.Formatter +- Active and Local filters are applied by default on the Users tab ### Fixed