diff --git a/src/admin/scss/_checkboxes.scss b/src/admin/scss/_checkboxes.scss index 655a6d271..b651f65e2 100644 --- a/src/admin/scss/_checkboxes.scss +++ b/src/admin/scss/_checkboxes.scss @@ -1,4 +1,6 @@ .b-checkbox.checkbox { + align-items: baseline; + margin-bottom: 5px; input[type="checkbox"] { box-shadow: none !important; diff --git a/src/admin/theme-items-list.vue b/src/admin/theme-items-list.vue index 2ff97cfb6..92e6ec4cf 100644 --- a/src/admin/theme-items-list.vue +++ b/src/admin/theme-items-list.vue @@ -117,6 +117,8 @@ export default { display: block; } .b-checkbox.checkbox { + align-items: baseline; + margin-bottom: 5px; input[type="checkbox"] { box-shadow: none !important; diff --git a/src/classes/field-types/category/AddNewTerm.vue b/src/classes/field-types/category/AddNewTerm.vue index 6b4fd753e..44f0d2af0 100644 --- a/src/classes/field-types/category/AddNewTerm.vue +++ b/src/classes/field-types/category/AddNewTerm.vue @@ -88,7 +88,7 @@ } else { const instance = this; - axios.post(`/taxonomy/${this.taxonomy_id}/terms`, { + axios.post(`/taxonomy/${this.taxonomy_id}/terms?hideempty=0&order=asc`, { name: this.name, parent: this.parent }) diff --git a/src/classes/field-types/category/Category.vue b/src/classes/field-types/category/Category.vue index ca31567b8..276867926 100644 --- a/src/classes/field-types/category/Category.vue +++ b/src/classes/field-types/category/Category.vue @@ -82,7 +82,7 @@ } }, getTermsFromTaxonomy(){ - axios.get('/taxonomy/' + this.taxonomy + '/terms?hideempty=0' ).then( res => { + axios.get('/taxonomy/' + this.taxonomy + '/terms?hideempty=0&order=asc' ).then( res => { for (let item of res.data) { this.terms.push( item ); } diff --git a/src/classes/filter-types/category/Checkbox.vue b/src/classes/filter-types/category/Checkbox.vue index 097c256cd..aaadd7628 100644 --- a/src/classes/filter-types/category/Checkbox.vue +++ b/src/classes/filter-types/category/Checkbox.vue @@ -55,7 +55,7 @@ }, methods: { getValuesCategory( taxonomy ){ - return axios.get('/taxonomy/' + taxonomy + '/terms?hideempty=0' ).then( res => { + return axios.get('/taxonomy/' + taxonomy + '/terms?hideempty=0&order=asc' ).then( res => { for (let item of res.data) { this.taxonomy = item.taxonomy; this.options.push(item); diff --git a/src/classes/filter-types/category/Taginput.vue b/src/classes/filter-types/category/Taginput.vue index 57b89b6f3..929e970ad 100644 --- a/src/classes/filter-types/category/Taginput.vue +++ b/src/classes/filter-types/category/Taginput.vue @@ -103,7 +103,7 @@ }); }, getValuesCategory( taxonomy, query ){ - return axios.get('/taxonomy/' + taxonomy + '/terms?hideempty=0' ).then( res => { + return axios.get('/taxonomy/' + taxonomy + '/terms?hideempty=0&order=asc' ).then( res => { for (let term of res.data) { if( term.name.toLowerCase().indexOf( query.toLowerCase() ) >= 0 ){ this.taxonomy = term.taxonomy; @@ -130,7 +130,7 @@ } }, getTerm( taxonomy, id ){ - return axios.get('/taxonomy/' + taxonomy + '/terms/' + id ).then( res => { + return axios.get('/taxonomy/' + taxonomy + '/terms/' + id + '?order=asc&hideempty=0' ).then( res => { this.$console.log(res); }) .catch(error => { diff --git a/src/js/store/modules/category/actions.js b/src/js/store/modules/category/actions.js index 1bd70660d..c6c65f3e6 100644 --- a/src/js/store/modules/category/actions.js +++ b/src/js/store/modules/category/actions.js @@ -171,7 +171,7 @@ export const updateTerm = ({ commit }, { categoryId, termId, name, description, export const fetchTerms = ({ commit }, categoryId ) => { return new Promise((resolve, reject) => { - axios.tainacan.get(`/taxonomy/${categoryId}/terms/?hideempty=0`) + axios.tainacan.get(`/taxonomy/${categoryId}/terms/?hideempty=0&order=asc`) .then(res => { let terms = res.data; commit('setTerms', terms);