Merge branch 'develop' into feature/387

This commit is contained in:
mateuswetah 2020-05-19 13:25:20 -03:00
commit 3ef4dd0c2c
18 changed files with 28 additions and 13 deletions

2
.gitignore vendored
View File

@ -12,6 +12,7 @@ node_modules
npm-debug.log
src/assets/js/*.js
src/assets/js/*.js.LICENSE
src/assets/js/*.js.LICENSE.txt
src/assets/*.js
last-js-build.md5
last-sass-build.md5
@ -23,7 +24,6 @@ src/assets/css/tainacan-admin.css.map
src/assets/js/report.html
src/assets/report.html
.vscode
src/pdf-viewer/pdfjs-dist
report.txt
.tmp
demosaved.csv

View File

@ -320,7 +320,20 @@ class Bulk_Edit_Process extends Generic_Process {
if ( $metadatum_from->get_metadata_type() == $metadatum->get_metadata_type() &&
( $metadatum_from->is_multiple() == false || $metadatum_from->is_multiple() == $metadatum->is_multiple() ) ) {
$item_metadata_from = new Entities\Item_Metadata_Entity( $item, $metadatum_from );
$item_metadata->set_value($item_metadata_from->get_value());
$value = $item_metadata_from->get_value();
if ( $metadata_type = $metadatum->get_metadata_type_object()->get_primitive_type() == 'term' ) {
if ( $metadatum_from->is_multiple() ) {
$temp = [];
foreach ( $value as $term ) {
$temp[] = $term->get_name();
}
$value = $temp;
} elseif ( $value instanceof \Tainacan\Entities\Term ) {
$value = $value->get_name();
}
}
$item_metadata->set_value($value);
return $this->save_item_metadata($item_metadata, $item);
}
}

View File

@ -86,7 +86,7 @@ class Importer_Handler {
function enqueue_scripts() {
global $TAINACAN_BASE_URL;
wp_enqueue_script('import_term_csv_script', $TAINACAN_BASE_URL . '/importer/term-importer/js/term.js', false, TAINACAN_VERSION, true);
wp_enqueue_script('import_term_csv_script', $TAINACAN_BASE_URL . '/classes/importer/term-importer/js/term.js', false, TAINACAN_VERSION, true);
}
function add_to_queue(\Tainacan\Importer\Importer $importer_object) {

View File

@ -2,9 +2,9 @@
Contributors: andrebenedito, daltonmartins, fabianobn, jacsonp, leogermani, weryques, wetah, eduardohumberto, ravipassos, jessicafpx, marinagiolo, omarceloavila, vnmedeiros, tainacan
Tags: museums, libraries, archives, GLAM, collections, repository
Requires at least: 4.8
Tested up to: 5.3https://profiles.wordpress.org/tainacan/
Tested up to: 5.4
Requires PHP: 5.6
Stable tag: 0.15.2
Stable tag: 0.16
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-3.0.html
@ -32,15 +32,15 @@ Tainacan is an open-source, powerful and flexible repository platform for WordPr
After installation, you will see a new menu item in your admin panel called "Tainacan". Click on it to open the Tainacan admin interface.
To get an overview of the main concepts of Tainacan, please visit [this page](https://tainacan.github.io/tainacan-wiki//#/general-concepts).
To get an overview of the main concepts of Tainacan, please visit [this page](https://tainacan.github.io/tainacan-wiki/#/general-concepts).
= Create a collection =
Click "New Collection" to create a new collection, use a mapping standard or import using one of our importers.
Click "New Collection" to create a new collection, use a mapping standard or import it using one of our importers.
= Configure your collection =
Navigate the top menu to set your collection up. Create the metadata that items in this collection will have, and choose, from these metadata, which ones are going to be used as a filter.
Navigate to the top menu to set your collection up. Create the metadata that items in this collection will have, and choose, from these metadata, which ones are going to be used as a filter.
= Add items =
@ -50,7 +50,7 @@ Back to the "Items" screen, click "Add new" to create a new item.
Through this admin interface you can manage your collection and browse its item using the faceted search interface or advanced search interface.
If you want to visit your collections in the public side of your site, using your current theme, visit http://your-site/tainacan-collection and you will get the list of your collections.
If you want to visit your collections in the public side of your site, using your current theme, visit http://your-site/collections and you will get the list of your collections.
= Set up Taxonomies =

View File

@ -4,13 +4,13 @@ Plugin Name: Tainacan
Plugin URI: https://tainacan.org/
Description: Open source, 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: Tainacan.org
Version: 0.16RC
Version: 0.16
Text Domain: tainacan
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-3.0.html
*/
const TAINACAN_VERSION = '0.16RC';
const TAINACAN_VERSION = '0.16';
defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
$TAINACAN_BASE_URL = plugins_url('', __FILE__);

View File

@ -247,7 +247,8 @@
v-if="!bulkEditionProcedures[criterion].isDone &&
!bulkEditionProcedures[criterion].isExecuting &&
bulkEditionProcedures[criterion].metadatum &&
bulkEditionProcedures[criterion].action"
bulkEditionProcedures[criterion].action &&
(bulkEditionProcedures[criterion].action != editionActions.copy || (bulkEditionProcedures[criterion].action == editionActions.copy && !!bulkEditionProcedures[criterion].metadatumIdCopyFrom))"
@click="executeBulkEditionProcedure(criterion)"
class="button is-white is-pulled-right">
<span
@ -605,7 +606,8 @@
return JSON.parse(JSON.stringify(this.metadata)).filter((metadatum) => {
return (
metadatum.id != selectedMetadatum.id &&
metadatum.metadata_type == selectedMetadatum.metadata_type
metadatum.metadata_type == selectedMetadatum.metadata_type &&
(selectedMetadatum.multiple == 'yes' || (metadatum.multiple != 'yes' && selectedMetadatum.multiple != 'yes'))
)
});
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 498 KiB

After

Width:  |  Height:  |  Size: 426 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 440 KiB

After

Width:  |  Height:  |  Size: 516 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 KiB

After

Width:  |  Height:  |  Size: 153 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 KiB

After

Width:  |  Height:  |  Size: 158 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 569 KiB

After

Width:  |  Height:  |  Size: 583 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 KiB

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 KiB

After

Width:  |  Height:  |  Size: 139 KiB