yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-05 07:49:23 +02:00
Code Issues Releases Wiki Activity

Revert "Fixed broken logging"

Browse source 
This reverts commit 68b21d706c.
This commit is contained in:
Eliot Berriot 2019-06-24 15:31:11 +02:00
parent 68b21d706c
commit b43bf42efc
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
8 changed files with 13 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

25
front/src/components/manage/moderation/DomainsTable.vue
View file

@ -6,14 +6,6 @@
<label><translate translate-context="Content/Search/Input.Label/Noun">Search</translate></label>
<input name="search" type="text" v-model="search" :placeholder="labels.searchPlaceholder" />
</div>
<div class="field">
<label><translate translate-context="Content/Moderation/*/Adjective">Is present on allow-list</translate></label>
<select class="ui dropdown" v-model="allowed">
<option :value="null"><translate translate-context="*/*/*">All</translate></option>
<option :value="true"><translate translate-context="*/*/*">Yes</translate></option>
<option :value="false"><translate translate-context="*/*/*">No</translate></option>
</select>
</div>
<div class="field">
<label><translate translate-context="Content/Search/Dropdown.Label/Noun">Ordering</translate></label>
<select class="ui dropdown" v-model="ordering">
@ -101,8 +93,7 @@ import TranslationsMixin from '@/components/mixins/Translations'
export default {
mixins: [OrderingMixin, TranslationsMixin],
props: {
filters: {type: Object, required: false},
allowListEnabled: {type: Boolean, default: false},
filters: {type: Object, required: false}
},
components: {
Pagination,
@ -117,7 +108,6 @@ export default {
page: 1,
paginateBy: 50,
search: '',
allowed: null,
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [
@ -134,16 +124,12 @@ export default {
},
methods: {
fetchData () {
let baseFilters = {
let params = _.merge({
'page': this.page,
'page_size': this.paginateBy,
'q': this.search,
'ordering': this.getOrderingAsString(),
}
if (this.allowed !== null) {
baseFilters.allowed = this.allowed
}
let params = _.merge(baseFilters, this.filters)
'ordering': this.getOrderingAsString()
}, this.filters)
let self = this
self.isLoading = true
self.checked = []
@ -193,9 +179,6 @@ export default {
page () {
this.fetchData()
},
allowed () {
this.fetchData()
},
ordering () {
this.fetchData()
},