Skip to content

Commit

Permalink
documents: fix controlled affiliations
Browse files Browse the repository at this point in the history
* Removes the field from the document editor.
* Fixes the display of the tooltip in document detail view.
* Forces to clear cache for JSON schemas, to have the right schema content.
* Closes #541.

Co-Authored-by: Sébastien Délèze <sebastien.deleze@rero.ch>
  • Loading branch information
Sébastien Délèze committed Jun 14, 2021
1 parent fa21361 commit 0a77c6b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1395,17 +1395,13 @@
"title": "Controlled affiliation",
"type": "string",
"minLength": 1
},
"form": {
"hideExpression": "field.parent.model.agent.type !== 'bf:Person'"
}
}
},
"propertiesOrder": [
"agent",
"role",
"affiliation",
"controlledAffiliation"
"affiliation"
],
"required": [
"agent",
Expand Down
6 changes: 3 additions & 3 deletions sonar/modules/documents/templates/documents/record.html
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,9 @@ <h5 class="modal-title" id="preview-title">{{ _('Preview') }}</h5>
{%- endblock %}

{% block javascript %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.6.0/umd/popper.min.js"
integrity="sha512-BmM0/BQlqh02wuK5Gz9yrbe7VyIVwOzD1o40yi1IsTjriX/NGF37NyXHfmFzIlMmoSIBXgqDiG1VNU6kB5dBbA=="
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.1/umd/popper.min.js"
integrity="sha512-ubuT8Z88WxezgSqf3RLuNi5lmjstiJcyezx34yIU2gAHonIi27Na7atqzUZCOoY4CExaoFumzOsFQ2Ch+I/HCw=="
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"
integrity="sha256-4+XzXVhsDmqanXGHaHvgh1gMQKX40OUvDEBTu8JcmNs=" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
Expand Down

0 comments on commit 0a77c6b

Please sign in to comment.