tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/tainacan/tainacan into develop

This commit is contained in:
weryques 2018-03-13 10:04:41 -03:00
parent 3b13c11acc d9d4fa7b88
commit 1c679d15ee
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/admin/components/lists/fields-list.vue
View File

@ -17,14 +17,14 @@
<div class="handle">
<b-icon type="is-gray" class="is-pulled-left" icon="drag"></b-icon>
<span class="field-name">{{ field.name }}</span>
<span class="label-details">{{ $i18n.get(field.field_type_object.component)}}<span class="loading-spinner" v-if="field.id == undefined"></span></span>
<span class="controls">
<span v-if="field.id !== undefined" class="label-details">{{ $i18n.get(field.field_type_object.component)}}</span><span class="loading-spinner" v-if="field.id == undefined"></span>
<span class="controls" v-if="field.id !== undefined">
<b-switch size="is-small" v-model="field.disabled" @input="onChangeEnable($event, index)">{{ field.disabled ? $i18n.get('label_disabled') : $i18n.get('label_enabled') }}</b-switch>
<a @click.prevent="removeField(field)" v-if="field.id != undefined">
<a @click.prevent="removeField(field)">
<b-icon icon="delete"></b-icon>
</a>
<a @click.prevent="editField(field)" v-if="field.id != undefined">
<b-icon icon="pencil" v-if="field.id != undefined"></b-icon>
<a @click.prevent="editField(field)">
<b-icon icon="pencil"></b-icon>
</a>
</span>
</div>

10
src/admin/components/lists/filters-list.vue
View File

@ -17,14 +17,14 @@
<div class="handle">
<b-icon type="is-gray" class="is-pulled-left" icon="drag"></b-icon>
<span class="filter-name">{{ filter.name }}</span>
<span class="label-details">{{ $i18n.get(filter.filter_type_object.component)}}<span class="loading-spinner" v-if="filter.id == undefined"></span></span>
<span class="controls">
<span v-if="filter.id !== undefined" class="label-details">{{ $i18n.get(filter.filter_type_object.component)}}</span><span class="loading-spinner" v-if="filter.id == undefined"></span>
<span class="controls" v-if="filter.id != undefined">
<b-switch size="is-small" v-model="filter.disabled" @input="onChangeEnable($event, index)">{{ filter.disabled ? $i18n.get('label_disabled') : $i18n.get('label_enabled') }}</b-switch>
<a @click.prevent="removeFilter(filter)" v-if="filter.id != undefined">
<a @click.prevent="removeFilter(filter)">
<b-icon icon="delete"></b-icon>
</a>
<a @click.prevent="editFilter(filter)" v-if="filter.id != undefined">
<b-icon icon="pencil" v-if="filter.id != undefined"></b-icon>
<a @click.prevent="editFilter(filter)">
<b-icon icon="pencil"></b-icon>
</a>
</span>
</div>

2
src/admin/tainacan-admin-i18n.php
View File

@ -132,7 +132,7 @@ return [
'tainacan-textarea' => __('Text area', 'tainacan'),
'tainacan-date' => __('Date', 'tainacan'),
'tainacan-numeric' => __('Numeric', 'tainacan'),
'tainacan-select' => __('Select box', 'tainacan'),
'tainacan-selectbox' => __('Select box', 'tainacan'),
'tainacan-relationship' => __('Relationship', 'tainacan'),
'tainacan-category' => __('Category', 'tainacan'),
]

5
src/js/store/modules/fields/actions.js
View File

@ -59,7 +59,8 @@ export const sendField = ( { commit }, { collectionId, name, fieldType, status,
status: status
})
.then( res => {
commit('setSingleField', { collection_id: collectionId, name: name, field_type: fieldType, status: status });
let field = res.data;
commit('setSingleField', field);
resolve( res.data );
})
.catch(error => {
@ -77,7 +78,7 @@ export const updateField = ( { commit }, { collectionId, fieldId, isRepositoryLe
else
endpoint = '/fields/' + fieldId;
axios.tainacan.put(endpoint, options)
axios.tainacan.put(endpoint + '?context=edit', options)
.then( res => {
commit('setSingleField', res.data);
resolve( res.data );

5
src/js/store/modules/filter/actions.js
View File

@ -85,8 +85,9 @@ export const sendFilter = ( { commit }, { collectionId, fieldId, name, filterTyp
status: status
})
.then( res => {
commit('setSingleFilter', { collection_id: collectionId, name: name, filter_type: filterType, status: status });
resolve( res.data );
let filter = res.data;
commit('setSingleFilter', filter);
resolve( filter );
})
.catch(error => {
reject( error.response );