documents: do not translate URL in detailed view

rerowep · iGor milhit · commit 25b24b9bc8f8 · 2021-09-09T14:39:35.000Z
* Prevents to translate the URL in the `electronicLocator` filed of the
  document detailed view. It resulted in an 500 Internal server error.

Co-Authored-by: Peter Weber &lt;peter.weber@rero.ch&gt;
diff --git a/rero_ils/modules/documents/templates/rero_ils/detailed_view_documents.html b/rero_ils/modules/documents/templates/rero_ils/detailed_view_documents.html
@@ -111,10 +111,10 @@ <h3>
         <ul class="list-unstyled mb-0">
         {% for resource in resources %}
           <li>
-            <a href="{{ resource.url }}">
+            <a class="rero-ils-external-link" href={{ resource.url }}>
               {{ _(resource.type) }}
               {% if resource.content %}
-                : {{ _(resource.content) }}
+                : {{ resource.content }}
               {% endif %}
             </a>
             {% if resource.public_note %}({{ resource.public_note }}){% endif %}
diff --git a/rero_ils/modules/documents/views.py b/rero_ils/modules/documents/views.py
@@ -407,7 +407,7 @@ def filter_type(electronic_locator):
     )
     for electronic_locator in filtered_electronic_locators:
         url = electronic_locator.get('url')
-        content = electronic_locator.get('content', url)
+        content = _(electronic_locator.get('content'))
         public_notes = electronic_locator.get('publicNote', [])
         public_note = ', '.join(public_notes)
         accesses.append({
diff --git a/rero_ils/theme/templates/rero_ils/page.html b/rero_ils/theme/templates/rero_ils/page.html
@@ -16,6 +16,7 @@
   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #}
+{% set viewcode=viewcode or config.RERO_ILS_SEARCH_GLOBAL_VIEW_CODE %}
 <!DOCTYPE html>
 <html{% if html_css_classes %} class="{{ html_css_classes|join(' ') }}" {% endif %}
   lang="{{ current_i18n.locale.language|safe }}" dir="{{ current_i18n.locale.text_direction }}">
diff --git a/tests/unit/test_documents_dojson.py b/tests/unit/test_documents_dojson.py
@@ -5195,7 +5195,7 @@ def test_marc21_to_electronicLocator_from_856(mock_cover_get):
     assert get_cover_art(data) is None
     assert get_other_accesses(data) == [
         {
-            'content': 'http://d-nb.info/1071856731/04',
+            'content': None,
             'public_note': 'Inhaltsverzeichnis, Bd. 1',
             'type': 'relatedResource',
             'url': 'http://d-nb.info/1071856731/04'
@@ -5243,7 +5243,7 @@ def test_marc21_to_electronicLocator_from_856(mock_cover_get):
     assert get_cover_art(data) == 'http://d-nb.info/image.png'
     assert get_other_accesses(data) == [
         {
-            'content': 'http://d-nb.info/1071856731/04',
+            'content': None,
             'public_note': 'Inhaltsverzeichnis, Bd. 1',
             'type': 'relatedResource',
             'url': 'http://d-nb.info/1071856731/04'

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ def filter_type(electronic_locator):`
`407`	`407`	`)`
`408`	`408`	`for electronic_locator in filtered_electronic_locators:`
`409`	`409`	`url = electronic_locator.get('url')`
`410`		`- content = electronic_locator.get('content', url)`
	`410`	`+ content = _(electronic_locator.get('content'))`
`411`	`411`	`public_notes = electronic_locator.get('publicNote', [])`
`412`	`412`	`public_note = ', '.join(public_notes)`
`413`	`413`	`accesses.append({`