Merge branch 'develop' into feature/advanced-search-shortcut-in-header

package.json

@@ -17,6 +17,7 @@
     "v-mask": "^1.3.2",
     "v-tooltip": "^2.0.0-rc.33",
     "vue": "^2.5.16",
+    "node-sass": "^4.9.2",
     "vue-router": "^3.0.1",
     "vuedraggable": "^2.16.0",
     "vuex": "^3.0.1"
@@ -35,7 +36,6 @@
     "eslint-loader": "^2.0.0",
     "eslint-plugin-vue": "^4.5.0",
     "file-loader": "^1.1.11",
-    "node-sass": "^4.9.2",
     "postcss-loader": "^2.1.6",
     "sass-loader": "^7.0.3",
     "style-loader": "^0.21.0",
@@ -43,7 +43,7 @@
     "vue-custom-element": "^3.2.2",
     "vue-loader": "^15.2.4",
     "vue-template-compiler": "^2.5.16",
-    "webpack": "^4.15.1",
+    "webpack": "^4.16.0",
     "webpack-cli": "^3.0.8",
     "webpack-dev-server": "^3.1.4"
   }

src/admin/components/search/filters-items-list.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="extra-margin">
         <collections-filter
                 :open="collapsed"
                 :query="getQuery"
@@ -39,4 +39,10 @@
             CollectionsFilter
         }
     }
-</script>
+</script>
+
+<style>
+    .extra-margin {
+        margin-bottom: 40px;
+    }
+</style>

src/classes/repositories/class-tainacan-metadata.php

@@ -531,7 +531,19 @@ class Metadata extends Repository {
             ]
         ];
 
-        if( $collection->get_parent() !== 0 ){
+        if( $collection->get_parent() != 0 ){
+
+        	if(!empty($metadata)){
+		        foreach ( $data_core_metadata as $index => $data_core_metadatum ) {
+		        	foreach ( $metadata as $metadatum ){
+		        		if ( $metadatum->get_metadata_type() === $data_core_metadatum['metadata_type'] ) {
+		        			update_post_meta($metadatum->get_id(), 'metadata_type', 'to_delete', $data_core_metadatum['metadata_type']);
+		        			wp_delete_post($metadatum->get_id(), true);
+		        		}
+		        	}
+		        }
+	        }
+
             return false;
         }
 

src/importer/class-tainacan-csv.php

@@ -67,7 +67,7 @@ class CSV extends Importer {
 
             $column = $this->handle_encoding( $values[ $cont ] );
 
-            $processedItem[ $header ] = ( $metadatum->get_multiple() ) ? 
+            $processedItem[ $header ] = ( $metadatum->is_multiple() ) ? 
                 explode( $this->get_option('multivalued_delimiter'), $column) : $column;
 
             $cont++;

src/readme.txt

@@ -2,9 +2,9 @@
 Contributors: fabianobn, jacsonp, leogermani, weryques, wetah
 Tags: museums, libraries, archives, GLAM, collections, repository
 Requires at least: 4.8
-Tested up to: 4.9
+Tested up to: 4.9.7
 Requires PHP: 5.6
-Stable tag: 0.1
+Stable tag: 0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 

src/tainacan.php

@@ -4,7 +4,7 @@ Plugin Name: Tainacan
 Plugin URI: https://tainacan.org/new
 Description: powerfull and flexible repository platform for WordPress. Manage and publish you digital collections as easily as publishing a post to your blog, while having all the tools of a professional respository platform.
 Author: Media Lab / UFG
-Version: 0.1
+Version: 0.2
 Text Domain: tainacan
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html