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

Merge branch 'develop' of github.com:tainacan/tainacan into develop

This commit is contained in:
vnmedeiros 2022-03-03 09:55:49 -03:00
parent 1dc70ac24f 22e1da8efc
commit 41976b7b76
7 changed files with 58 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package-lock.json generated
View File

@ -2441,9 +2441,9 @@
}
},
"buefy": {
"version": "0.9.17",
"resolved": "https://registry.npmjs.org/buefy/-/buefy-0.9.17.tgz",
"integrity": "sha512-+rERzamvkflMsoE6GDqGdj5vpDUmdm5MnCnwjK2O8pdnwr8Pmab94cO//0Vd8ys539qWoeqsjh+B7vPg/lT/nQ==",
"version": "0.9.19",
"resolved": "https://registry.npmjs.org/buefy/-/buefy-0.9.19.tgz",
"integrity": "sha512-5AonCrtZvTfoWJwqmoTl8JbHjjn/U+q0LrSScgUWRZBaquzb8xgzWoownG4dzNHq5veQdOOxA0aUVyK+x7X07g==",
"requires": {
"bulma": "0.9.3"
}
@ -4886,8 +4886,7 @@
},
"ini": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"resolved": "",
"dev": true,
"optional": true
},

2
package.json
View File

@ -11,7 +11,7 @@
"apexcharts": "^3.33.1",
"axios": "^0.21.4",
"blurhash": "^1.1.5",
"buefy": "^0.9.17",
"buefy": "^0.9.19",
"bulma": "^0.9.3",
"conditioner-core": "^2.3.3",
"countup.js": "^2.0.8",

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

@ -39,7 +39,9 @@
label-width="120px">
<div class="columns">
<div class="column is-7">
<div
class="column"
:class="!$adminOptions.hideItemEditionDocument || !$adminOptions.hideItemEditionThumbnail ? 'is-7' : 'is-12'">
<!-- Hook for extra Form options -->
<template v-if="hasBeginRightForm">
@ -355,7 +357,7 @@
<!-- Attachments ------------------------------------------ -->
<div
v-if="activeTab === 'attachments'"
v-if="activeTab === 'attachments' && !$adminOptions.hideItemEditionAttachments"
class="tab-item"
role="tabpanel"
aria-labelledby="attachments-tab-label"
@ -390,7 +392,9 @@
</div>
</div>
<div class="column is-5">
<div
v-if="!$adminOptions.hideItemEditionDocument || !$adminOptions.hideItemEditionThumbnail"
class="column is-5">
<div class="sticky-container">
@ -403,13 +407,17 @@
</template>
<!-- Document -------------------------------- -->
<div class="section-label">
<div
v-if="!$adminOptions.hideItemEditionDocument"
class="section-label">
<label>{{ form.document != undefined && form.document != null && form.document != '' ? $i18n.get('label_document') : $i18n.get('label_document_empty') }}</label>
<help-button
:title="$i18n.getHelperTitle('items', 'document')"
:message="$i18n.getHelperMessage('items', 'document')"/>
</div>
<div class="section-box document-field">
<div
v-if="!$adminOptions.hideItemEditionDocument"
class="section-box document-field">
<div
v-if="form.document != undefined && form.document != null &&
form.document_type != undefined && form.document_type != null &&
@ -1066,12 +1074,14 @@ export default {
total: this.totalRelatedItems
});
}
if (!this.$adminOptions.hideItemEditionAttachments) {
pageTabs.push({
slug: 'attachments',
icon: 'attachments',
name: this.$i18n.get('label_attachments'),
total: this.totalAttachments
});
}
return pageTabs;
},
isCurrentlyFocusedOnCompoundMetadatum() {

6
src/views/admin/components/metadata-types/relationship/Relationship.vue
View File

@ -111,7 +111,11 @@
</b-tab-item>
</b-tabs>
<a
v-if="currentUserCanEditItems && itemMetadatum.item && itemMetadatum.item.id && (maxMultipleValues === undefined || maxMultipleValues > selected.length)"
v-if="currentUserCanEditItems &&
itemMetadatum.item &&
itemMetadatum.item.id &&
(maxMultipleValues === undefined || maxMultipleValues > selected.length) &&
(itemMetadatum.metadatum.multiple === 'yes' || !selected.length )"
:disabled="$adminOptions.itemEditionMode"
@click="editItemModalOpen = !editItemModalOpen"
class="add-link">

11
src/views/admin/components/navigation/tainacan-repository-subheader.vue
View File

@ -26,10 +26,13 @@
v-else
:style="$adminOptions.hideCollectionSubheader ? 'margin-right: auto;' : ''">
{{ $i18n.get('collection') + '' }}
<span class="has-text-weight-bold">
{{ collection && collection.name ? collection.name : '' }}
<router-link
v-if="collection && collection.id"
:to="$routerHelper.getCollectionPath(collection.id)"
class="has-text-weight-bold has-text-white">
{{ collection.name ? collection.name : '' }}
<span
v-if="collection && collection.status && $statusHelper.hasIcon(collection.status)"
v-if="collection.status && $statusHelper.hasIcon(collection.status)"
class="icon has-text-white"
v-tooltip="{
content: $i18n.get('status_' + collection.status),
@ -42,7 +45,7 @@
:class="$statusHelper.getIcon(collection.status)"
/>
</span>
</span>
</router-link>
</h1>
<ul class="repository-subheader-icons">

4
src/views/admin/js/admin-utilities.js
View File

@ -616,10 +616,12 @@ AdminOptionsHelperPlugin.install = function (Vue, options = {}) {
* hideItemEditionStatusOptions
* hideItemEditionStatusPublishOption
* hideItemEditionCommentsToggle
* hideItemEditionDocument
* hideItemEditionDocumentFileInput
* hideItemEditionDocumentTextInput
* hideItemEditionDocumentUrlInput
* hideItemEditionThumbnail
* hideItemEditionAttachments
* hideBulkEditionPageTitle
@ -628,7 +630,9 @@ AdminOptionsHelperPlugin.install = function (Vue, options = {}) {
* hideItemSingleCurrentStatus
* hideItemSingleCurrentVisibility
* hideItemSingleCommentsOpen
* hideItemSingleDocument
* hideItemSingleThumbnail
* hideItemSingleAttachments
* hideItemSingleActivities
* hideItemSingleExposers
*/

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

@ -26,7 +26,9 @@
<div class="tainacan-form">
<div class="columns">
<div class="column is-7">
<div
class="column"
:class="!$adminOptions.hideItemSingleDocument || !$adminOptions.hideItemSingleThumbnail ? 'is-7' : 'is-12'">
<!-- Hook for extra Form options -->
<template v-if="hasBeginRightForm">
@ -233,7 +235,7 @@
</b-tab-item>
<b-tab-item>
<b-tab-item v-if="!$adminOptions.hideItemSingleAttachments">
<template slot="header">
<span class="icon has-text-gray5">
<i class="tainacan-icon tainacan-icon-18px tainacan-icon-attachments"/>
@ -268,7 +270,9 @@
</b-tabs>
</div>
<div class="column is-5">
<div
v-if="!$adminOptions.hideItemSingleDocument || !$adminOptions.hideItemSingleThumbnail"
class="column is-5">
<div class="sticky-container">
<!-- Hook for extra Form options -->
@ -280,12 +284,16 @@
</template>
<!-- Document -------------------------------- -->
<div class="section-label">
<div
v-if="!$adminOptions.hideItemSingleDocument"
class="section-label">
<label>{{ item.document !== undefined && item.document !== null && item.document !== ''
?
$i18n.get('label_document') : $i18n.get('label_document_empty') }}</label>
</div>
<div class="section-box document-field">
<div
v-if="!$adminOptions.hideItemSingleDocument"
class="section-box document-field">
<div
v-if="item.document !== undefined && item.document !== null &&
item.document_type !== undefined && item.document_type !== null &&