forked from AkkomaGang/admin-fe
Merge branch 'feature/apply-filters-on-users-tab' into 'develop'
Apply default 'local' and 'active' filters on users tab Closes #133 See merge request pleroma/admin-fe!148
This commit is contained in:
commit
e8e43c236d
4 changed files with 18 additions and 15 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -329,6 +329,7 @@ export default {
|
|||
flex-direction: column;
|
||||
margin: 0 10px
|
||||
}
|
||||
.el-table__row {
|
||||
.el-tag {
|
||||
width: 30px;
|
||||
display: inline-block;
|
||||
|
@ -341,6 +342,7 @@ export default {
|
|||
padding-left: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.reboot-button {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue