From 33d3f06651d78edb1862b2850acb474788812795 Mon Sep 17 00:00:00 2001 From: weryques Date: Mon, 29 Jan 2018 14:42:59 -0200 Subject: [PATCH] Fixes thumnail exhibition, Implements UpdateMetadata --- build.sh | 10 +++++----- src/api/class-tainacan-rest-controller.php | 2 +- ...class-tainacan-rest-collections-controller.php | 2 +- src/classes/field-types/text/Text.vue | 4 ++-- .../repositories/class-tainacan-repository.php | 3 +-- src/js/store/modules/item/actions.js | 15 ++++++++++++++- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/build.sh b/build.sh index a16b17812..4469e966a 100755 --- a/build.sh +++ b/build.sh @@ -8,21 +8,21 @@ current_OS=`uname` # For macOS (Darwin) if [ $current_OS == "Darwin" ]; then - find src -type f \( -name "*.js" -or -name "*.vue" \) -exec md5 {} \; | sort -k 2 | md5 > last-js-build.md5 + find src -type f \( -name "*.js" -or -name "*.vue" -or -name "*.scss" \) -exec md5 {} \; | sort -k 2 | md5 > last-js-build.md5 else - find src -type f \( -name "*.js" -or -name "*.vue" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-js-build.md5 + find src -type f \( -name "*.js" -or -name "*.vue" -or -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-js-build.md5 fi new_md5=$(get_columns(); + $entity_prepared['columns'] = $entity->get_columns(); } return $entity_prepared; diff --git a/src/api/endpoints/class-tainacan-rest-collections-controller.php b/src/api/endpoints/class-tainacan-rest-collections-controller.php index ed72a5050..b209870a4 100644 --- a/src/api/endpoints/class-tainacan-rest-collections-controller.php +++ b/src/api/endpoints/class-tainacan-rest-collections-controller.php @@ -119,7 +119,7 @@ class TAINACAN_REST_Collections_Controller extends TAINACAN_REST_Controller { if ($item->have_posts()) { while ( $item->have_posts() ) { $item->the_post(); - $collection = new Entities\Collection($item->post); + $collection = new Entities\Collection($item->post->ID); $collection_resumed = $this->get_only_needed_attributes($collection, $map); diff --git a/src/classes/field-types/text/Text.vue b/src/classes/field-types/text/Text.vue index 0fbb109cd..7f5af9649 100644 --- a/src/classes/field-types/text/Text.vue +++ b/src/classes/field-types/text/Text.vue @@ -51,11 +51,11 @@ }, setInitValueOnStore(){ if ( this.value ){ - this.$store.dispatch('item/updateMetadata', { item_id: this.item_id, metadata_id: this.metadata_id, values: JSON.parse( this.value ) }); + this.$store.dispatch('item/sendMetadata', { item_id: this.item_id, metadata_id: this.metadata_id, values: JSON.parse( this.value ) }); } }, setValue( event ){ - this.$store.dispatch('item/sendMetadata', { item_id: this.item_id, metadata_id: this.metadata_id, values: event.target.value }); + this.$store.dispatch('item/updateMetadata', { item_id: this.item_id, metadata_id: this.metadata_id, values: event.target.value }); } } } diff --git a/src/classes/repositories/class-tainacan-repository.php b/src/classes/repositories/class-tainacan-repository.php index 0b63864d3..4587023ad 100644 --- a/src/classes/repositories/class-tainacan-repository.php +++ b/src/classes/repositories/class-tainacan-repository.php @@ -283,8 +283,7 @@ abstract class Repository { } elseif ( isset( $entity->WP_Post )) { if($mapped == 'thumbnail'){ $property = get_the_post_thumbnail_url($entity->WP_Post->ID, 'full'); - } - else { + } else { $property = isset($entity->WP_Post->$mapped) ? $entity->WP_Post->$mapped : null; } } elseif ( isset( $entity->WP_Term )) { diff --git a/src/js/store/modules/item/actions.js b/src/js/store/modules/item/actions.js index 2a2069c57..a5c5fdb45 100644 --- a/src/js/store/modules/item/actions.js +++ b/src/js/store/modules/item/actions.js @@ -24,7 +24,20 @@ export const sendMetadata = ( { commit }, { item_id, metadata_id, values }) => { export const updateMetadata = ({ commit }, { item_id, metadata_id, values }) => { - commit('setSingleMetadata', { item_id: item_id, metadata_id: metadata_id, values: values }); + return new Promise((resolve, reject) => { + axios.patch(`/item/${item_id}/metadata/`, { + metadata_id: metadata_id, + values: values + }) + .then( res => { + console.log(res); + let metadata = res.data; + commit('setSingleMetadata', metadata); + }) + .catch( error => { + console.log('error', error); + }) + }); }; export const fetchMetadata = ({ commit }, item_id) => {