From 7711f002b6b5018738f6edbc51da34bec911fc3e Mon Sep 17 00:00:00 2001 From: weryques Date: Fri, 20 Jul 2018 15:43:53 -0300 Subject: [PATCH] Improvements on advanced search component --- .../components/advanced-search/advanced-search.vue | 13 ++++++++++--- .../collection-filter/collection-filter.vue | 10 +--------- src/admin/pages/lists/items-page.vue | 2 +- src/admin/scss/_tags.scss | 1 + src/admin/tainacan-admin-i18n.php | 2 +- src/importer/class-tainacan-csv.php | 2 +- src/js/store/modules/metadata/actions.js | 2 ++ src/js/store/modules/metadata/mutations.js | 4 ++++ src/setup-db.php | 2 +- 9 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/admin/components/advanced-search/advanced-search.vue b/src/admin/components/advanced-search/advanced-search.vue index 0063e1455..c5faa5f7e 100644 --- a/src/admin/components/advanced-search/advanced-search.vue +++ b/src/admin/components/advanced-search/advanced-search.vue @@ -129,7 +129,11 @@ icon="plus-circle" size="is-small" type="is-secondary"/> - {{ $i18n.get('add_another_search_criterion') }} + {{ searchCriteria.length <= 0 ? + $i18n.get('add_one_search_criterion') : + $i18n.get('add_another_search_criterion') + }} + @@ -173,7 +177,10 @@ v-show="!advancedSearchResults" class="column">
-

+

@@ -600,7 +607,7 @@ margin-left: -5px !important; } - tainacan-input-disabled { + .tainacan-input-disabled { background-color: $gray; } } diff --git a/src/admin/components/repository/collection-filter/collection-filter.vue b/src/admin/components/repository/collection-filter/collection-filter.vue index b6e72f57c..72467d137 100644 --- a/src/admin/components/repository/collection-filter/collection-filter.vue +++ b/src/admin/components/repository/collection-filter/collection-filter.vue @@ -14,7 +14,7 @@

+ class="block">
- - \ No newline at end of file diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue index b1239293c..a69a389f6 100644 --- a/src/admin/pages/lists/items-page.vue +++ b/src/admin/pages/lists/items-page.vue @@ -381,7 +381,7 @@

- {{ $i18n.get('exit') }} + {{ $i18n.get('back') }}

diff --git a/src/admin/scss/_tags.scss b/src/admin/scss/_tags.scss index c8070c14d..4c2c23164 100644 --- a/src/admin/scss/_tags.scss +++ b/src/admin/scss/_tags.scss @@ -14,6 +14,7 @@ .tag { background-color: white; margin-bottom: 0 !important; + margin-right: 4px !important; max-width: calc(100% - 21px); justify-content: flex-start; overflow: hidden; diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php index 0382778f2..5f96b5ef0 100644 --- a/src/admin/tainacan-admin-i18n.php +++ b/src/admin/tainacan-admin-i18n.php @@ -58,10 +58,10 @@ return apply_filters( 'tainacan-admin-i18n', [ 'split' => __( 'Split', 'tainacan' ), 'unified' => __( 'Unified', 'tainacan' ), 'add_another_search_criterion' => __( 'Add another search criterion', 'tainacan' ), + 'add_one_search_criterion' => __( 'Add one search criterion', 'tainacan' ), 'clear_search' => __( 'Clear search', 'tainacan' ), 'run' => __( 'Run', 'tainacan' ), 'edit_search' => __( 'Edit search', 'tainacan' ), - 'exit' => __( 'Exit', 'tainacan' ), // Wordpress Status 'publish' => __( 'Publish', 'tainacan' ), diff --git a/src/importer/class-tainacan-csv.php b/src/importer/class-tainacan-csv.php index 4672fd19f..b1be5210d 100644 --- a/src/importer/class-tainacan-csv.php +++ b/src/importer/class-tainacan-csv.php @@ -45,7 +45,7 @@ class CSV extends Importer { $processedItem = []; $headers = $this->get_source_metadata(); - $this->add_log('Proccessing item index ' . $index . ' in collection ' . $collection_id['id'] ); + $this->add_log('Proccessing item index ' . $index . ' in collection ' . $collection_definition['id'] ); // search the index in the file and get values $file = new \SplFileObject( $this->tmp_file, 'r' ); $file->setFlags(\SplFileObject::SKIP_EMPTY); diff --git a/src/js/store/modules/metadata/actions.js b/src/js/store/modules/metadata/actions.js index cda5a7ad0..8061d6ede 100644 --- a/src/js/store/modules/metadata/actions.js +++ b/src/js/store/modules/metadata/actions.js @@ -1,6 +1,8 @@ import axios from '../../../axios/axios'; export const fetchMetadata = ({commit}, {collectionId, isRepositoryLevel, isContextEdit, includeDisabled}) => { + commit('cleanMetadata'); + return new Promise((resolve, reject) => { let endpoint = ''; if (!isRepositoryLevel) diff --git a/src/js/store/modules/metadata/mutations.js b/src/js/store/modules/metadata/mutations.js index fdb49fbf9..316e971bf 100644 --- a/src/js/store/modules/metadata/mutations.js +++ b/src/js/store/modules/metadata/mutations.js @@ -22,3 +22,7 @@ export const setMetadatumTypes = (state, metadatumTypes) => { export const setMetadatumMappers = (state, metadatumMappers) => { state.metadatumMappers = metadatumMappers; } + +export const cleanMetadata = (state) => { + state.metadata = []; +} \ No newline at end of file diff --git a/src/setup-db.php b/src/setup-db.php index 3df1291cf..93876a717 100644 --- a/src/setup-db.php +++ b/src/setup-db.php @@ -40,7 +40,7 @@ function tainacan_create_bd_process_db() { if(empty($column_exists)) { $wpdb->query(" ALTER TABLE {$wpdb->prefix}tnc_bg_process - ADD name text NOT NULL, + ADD name text NOT NULL "); }