Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker-compose.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ services:
- "INVENIO_IIIF_PROXY_CLASS=None"
image: zenodo:latest
ports:
- "${DOCKER_SERVICES_IP_BIND:-127.0.0.1}:5000"
- "${DOCKER_SERVICES_IP_BIND:-127.0.0.1}:5000:5000"
volumes:
- static_data:/opt/invenio/var/instance/static
- uploaded_data:/opt/invenio/var/instance/data
Expand All @@ -75,7 +75,7 @@ services:
- "INVENIO_IIIF_PROXY_CLASS=None"
image: zenodo:latest
ports:
- "${DOCKER_SERVICES_IP_BIND:-127.0.0.1}:5000"
- "${DOCKER_SERVICES_IP_BIND:-127.0.0.1}:5001:5000"
volumes:
- uploaded_data:/opt/invenio/var/instance/data
- archived_data:/opt/invenio/var/instance/archive
Expand Down
4 changes: 2 additions & 2 deletions docker-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ services:
- "${DOCKER_SERVICES_IP_BIND:-127.0.0.1}:15672:15672"
- "${DOCKER_SERVICES_IP_BIND:-127.0.0.1}:5672:5672"
search:
image: opensearchproject/opensearch:2.15.0
image: opensearchproject/opensearch:3.2.0
restart: "unless-stopped"
environment:
- bootstrap.memory_lock=true
Expand Down Expand Up @@ -98,7 +98,7 @@ services:
- "${DOCKER_SERVICES_IP_BIND:-127.0.0.1}:9200:9200"
- "${DOCKER_SERVICES_IP_BIND:-127.0.0.1}:9300:9300"
opensearch-dashboards:
image: opensearchproject/opensearch-dashboards:2.15.0
image: opensearchproject/opensearch-dashboards:3.2.0
ports:
- "${DOCKER_SERVICES_IP_BIND:-127.0.0.1}:5601:5601"
expose:
Expand Down
26 changes: 1 addition & 25 deletions invenio.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -437,31 +437,7 @@ RDM_RESOURCE_ACCESS_TOKEN_REQUEST_ARG = "resource-token"
RDM_RESOURCE_ACCESS_TOKENS_SUBJECT_SCHEMA = RATSubjectSchema

RDM_IMMEDIATE_RECORD_DELETION_ENABLED = True
RDM_REQUEST_RECORD_DELETION_ENABLED = True
RDM_REQUEST_RECORD_DELETION_CHECKLIST = [
{
"label": _("I want to change the metadata (title, description, etc.)"),
"message": _(
"You can "
'<a href="https://help.zenodo.org/docs/deposit/manage-records/#edit">edit the metadata of a published record</a> '
"at any time."
),
},
{
"label": _("I forgot to submit to a community"),
"message": _(
"You can "
'<a href="https://help.zenodo.org/docs/share/submit-to-community/">submit a published record to a community</a> '
"at any time."
),
},
{
"label": _("I want to get a Zenodo DOI for this record"),
"message": _(
'<a href="/support">Contact the Zenodo support team</a> about this record.'
),
},
]
RDM_REQUEST_RECORD_DELETION_ENABLED = False
RDM_IMMEDIATE_FILE_MODIFICATION_POLICIES = [
FileModificationGracePeriodPolicy(),
FileModificationAdminPolicy(),
Expand Down
19 changes: 13 additions & 6 deletions site/zenodo_rdm/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,15 @@
"title": "File modification",
"description": (
'<div class="ui warning visible message">'
'<div class="header">You can modify your files</div>'
'<p>Please follow the documentation to <a href="https://help.zenodo.org/docs/deposit/manage-files/#modify">edit your published files</a> first. Requests for records within 30 days of publication will be automatically declined.</p>'
"<p>Note: If over 30 days have passed since publication, please enquire below.</p>"
'<div class="header">Modifying record files</div>'
"<ul>"
'<li><strong>Published within the last 30 days:</strong> Follow the <a href="https://help.zenodo.org/docs/deposit/manage-files/#modify">file modification guide</a> to edit your published files.</li>'
'<li><strong>Published more than 30 days ago:</strong> File modification is no longer possible. You can <a href="https://help.zenodo.org/docs/deposit/create-new-upload/#visibility">restrict public access to files</a>, <a href="https://help.zenodo.org/docs/deposit/describe-records/descriptions/">add a public note</a>, and <a href="https://help.zenodo.org/docs/deposit/manage-versions/">upload a new version</a> with the corrected files.</li>'
"</ul>"
"<p>For copyright issues, select <strong>Take-down notice</strong> from the category above. For personal data exposure, select <strong>Report personal data exposure</strong>.</p>"
"</div>"
),
"form_disabled": True,
},
{
"key": "quota-increase",
Expand All @@ -76,9 +80,12 @@
"title": "Record deletion",
"description": (
'<div class="ui warning visible message">'
'<div class="header">You can delete your record</div>'
'<p>Please follow the documentation on <a href="https://help.zenodo.org/docs/deposit/manage-records/#delete">how to delete records</a> instead of creating a support ticket here.</p>'
"<p>Note: if you are not able to delete the record as you are not the uploader, choose <em>take-down notice</em> instead</p>"
'<div class="header">Deleting a record</div>'
"<ul>"
'<li><strong>Published within the last 30 days:</strong> Follow the <a href="https://help.zenodo.org/docs/deposit/manage-records/#delete">deletion guide</a> to delete your record.</li>'
'<li><strong>Published more than 30 days ago:</strong> Deletion is no longer possible. You can <a href="https://help.zenodo.org/docs/deposit/create-new-upload/#visibility">restrict public access to files</a>, <a href="https://help.zenodo.org/docs/deposit/describe-records/descriptions/">add a public note</a>, and optionally <a href="https://help.zenodo.org/docs/deposit/manage-versions/">upload a new version</a> if needed.</li>'
"</ul>"
"<p>For copyright issues, select <strong>Take-down notice</strong> from the category above. For personal data exposure, select <strong>Report personal data exposure</strong>.</p>"
"</div>"
),
"form_disabled": True,
Expand Down