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

Fixes wrong positionint for metada compress button in tems page. Removes unecessary selected attribution on checkbox filter.

This commit is contained in:
Mateus Machado Luna 2018-09-11 14:08:20 -03:00
parent 2938afc6c0
commit fa18e6a270
5 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/admin/components/edition/item-edition-form.vue
View File

@ -312,7 +312,7 @@
v-html="formHooks['item']['end-left'].join('')"/> v-html="formHooks['item']['end-left'].join('')"/>
</template> </template>
</div> </div>
<div <div
class="column is-4-5" class="column is-4-5"
v-show="!isMetadataColumnCompressed"> v-show="!isMetadataColumnCompressed">
@ -933,9 +933,9 @@ export default {
@import '../../scss/_variables.scss'; @import '../../scss/_variables.scss';
#metadata-column-compress-button { #metadata-column-compress-button {
position: relative; position: absolute;
z-index: 99; z-index: 99;
float: right; right: 0;
top: 70px; top: 70px;
max-width: 36px; max-width: 36px;
height: 36px; height: 36px;

4
src/admin/pages/singles/item-page.vue
View File

@ -433,9 +433,9 @@
@import '../../scss/_variables.scss'; @import '../../scss/_variables.scss';
#metadata-column-compress-button { #metadata-column-compress-button {
position: relative; position: absolute;
z-index: 99; z-index: 99;
float: right; right: 0;
top: 70px; top: 70px;
max-width: 36px; max-width: 36px;
height: 36px; height: 36px;

12
src/admin/scss/_tags.scss
View File

@ -6,6 +6,8 @@
margin-right: 0.375rem; margin-right: 0.375rem;
max-width: 100%; max-width: 100%;
overflow: hidden; overflow: hidden;
animation-name: appear;
animation-duration: 0.2s;
&:hover, &:hover .tag { &:hover, &:hover .tag {
background-color: $gray2; background-color: $gray2;
@ -21,14 +23,18 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
&.is-delete { &.is-delete,
&.is-delete:hover,
&.is-delete:focus,
&.is-delete:active {
border-radius: 50px !important; border-radius: 50px !important;
border-radius: 50px !important; border-radius: 50px !important;
color: $gray4; color: $gray4;
background-color: transparent;
&:hover { &:hover {
background-color: white !important; background-color: transparent;
color: $gray5; color: $gray4;
} }
} }
} }

51
src/classes/filter-types/checkbox/Checkbox.vue
View File

@ -98,8 +98,8 @@
}, },
mixins: [filter_type_mixin], mixins: [filter_type_mixin],
watch: { watch: {
selected: function(val){ selected: function(){
this.selected = val; //this.selected = val;
this.onSelect(); this.onSelect();
} }
}, },
@ -113,34 +113,35 @@
this.metadatum_object.metadata_type_options.collection_id : this.collection_id; this.metadatum_object.metadata_type_options.collection_id : this.collection_id;
promise = this.getValuesRelationship( collectionTarget, null, [], 0, this.filter.max_options); promise = this.getValuesRelationship( collectionTarget, null, [], 0, this.filter.max_options);
promise
promise.then(() => { .then(() => {
if(this.options.length > this.filter.max_options){ if(this.options.length > this.filter.max_options){
this.options.splice(this.filter.max_options); this.options.splice(this.filter.max_options);
} }
}).catch((error) => { }).catch((error) => {
this.$console.error(error); this.$console.error(error);
}) })
} else { } else {
promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel, [], 0, this.filter.max_options ); promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel, [], 0, this.filter.max_options );
promise
promise.then(() => { .then(() => {
if(this.options.length > this.filter.max_options){ if(this.options.length > this.filter.max_options){
this.options.splice(this.filter.max_options); this.options.splice(this.filter.max_options);
} }
}).catch((error) => { }).catch((error) => {
this.$console.error(error); this.$console.error(error);
}) })
} }
promise.then(() => { promise
this.isLoading = false; .then(() => {
this.selectedValues() this.isLoading = false;
}) this.selectedValues()
.catch( error => { })
this.$console.log('error select', error ); .catch( error => {
this.isLoading = false; this.$console.log('error select', error );
}); this.isLoading = false;
});
}, },
onSelect(){ onSelect(){
this.$emit('input', { this.$emit('input', {

6
src/classes/filter-types/taxonomy/Checkbox.vue
View File

@ -88,8 +88,8 @@
} }
}, },
watch: { watch: {
selected: function(val){ selected: function(){
this.selected = val; //this.selected = val;
this.onSelect(); this.onSelect();
} }
}, },
@ -146,7 +146,7 @@
if ( !this.query || !this.query.taxquery || !Array.isArray( this.query.taxquery ) ) if ( !this.query || !this.query.taxquery || !Array.isArray( this.query.taxquery ) )
return false; return false;
let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy === this.taxonomy ); let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy == this.taxonomy );
if ( index >= 0){ if ( index >= 0){
let metadata = this.query.taxquery[ index ]; let metadata = this.query.taxquery[ index ];
this.selected = metadata.terms; this.selected = metadata.terms;