From 6a9700f5be4466113ec132eb58dcd44025d3165a Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 20 Sep 2024 12:08:45 -0400 Subject: [PATCH 1/3] adding the prefix when setting up links --- app/assets/javascripts/services/bookSvc.js | 16 +++++++++++++--- app/views/judgements/_form.html.erb | 16 ++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/services/bookSvc.js b/app/assets/javascripts/services/bookSvc.js index cc2d9c95f..bcd3143e0 100644 --- a/app/assets/javascripts/services/bookSvc.js +++ b/app/assets/javascripts/services/bookSvc.js @@ -88,11 +88,21 @@ angular.module('QuepidApp') fields['title_field'] = doc.doc.title; } - if (doc.hasThumb()) { - fields['thumb'] = doc.thumb; + if (doc.hasThumb()) { + if (doc.thumb_options?.prefix){ + fields['thumb'] = `${doc.thumb_options.prefix}${doc.thumb}`; + } + else { + fields['thumb'] = doc.thumb; + } } if (doc.hasImage()){ - fields['image'] = doc.image; + if (doc.image_options?.prefix){ + fields['image'] = `${doc.image_options.prefix}${doc.image}`; + } + else { + fields['image'] = doc.image; + } } const queryDocPair = { diff --git a/app/views/judgements/_form.html.erb b/app/views/judgements/_form.html.erb index f267868dc..c92f1bef0 100644 --- a/app/views/judgements/_form.html.erb +++ b/app/views/judgements/_form.html.erb @@ -327,7 +327,15 @@ judgement.id: <%= judgement.id %> @document_fields_as_json = document_fields_parses_as_json (query_doc_pair.document_fields) - has_thumb = !@document_fields_as_json.nil? && @document_fields_as_json.has_key?('thumb') + + image_url = nil + if !@document_fields_as_json.nil? + if @document_fields_as_json.has_key?('thumb') + image_url = @document_fields_as_json['thumb'] + elsif @document_fields_as_json.has_key?('image') + image_url = @document_fields_as_json['image'] + end + end %> @@ -344,11 +352,11 @@ judgement.id: <%= judgement.id %> <% end %> - <% if has_thumb %> + <% if image_url %>
- Thumbnail Image + Thumbnail Image
<% else %> @@ -450,7 +458,7 @@ judgement.id: <%= judgement.id %>
Judging Explanation: <%= judgement.explanation %>
<% end %>
- <% if has_thumb %> + <% if image_url %>
From 757bb1e576d71674dc3296acaac4acaa803dde4b Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 20 Sep 2024 12:15:05 -0400 Subject: [PATCH 2/3] fix lint --- app/assets/javascripts/services/bookSvc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/services/bookSvc.js b/app/assets/javascripts/services/bookSvc.js index bcd3143e0..4b2d55883 100644 --- a/app/assets/javascripts/services/bookSvc.js +++ b/app/assets/javascripts/services/bookSvc.js @@ -89,7 +89,7 @@ angular.module('QuepidApp') } if (doc.hasThumb()) { - if (doc.thumb_options?.prefix){ + if (doc.thumb_options?.prefix){ // jshint ignore:line fields['thumb'] = `${doc.thumb_options.prefix}${doc.thumb}`; } else { @@ -97,7 +97,7 @@ angular.module('QuepidApp') } } if (doc.hasImage()){ - if (doc.image_options?.prefix){ + if (doc.image_options?.prefix){ // jshint ignore:line fields['image'] = `${doc.image_options.prefix}${doc.image}`; } else { From d7d20392c35d13e0661b36bd837b1a87f09b9419 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 20 Sep 2024 12:19:42 -0400 Subject: [PATCH 3/3] lint --- app/assets/javascripts/controllers/searchResults.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/controllers/searchResults.js b/app/assets/javascripts/controllers/searchResults.js index 0f831d099..db1da7e73 100644 --- a/app/assets/javascripts/controllers/searchResults.js +++ b/app/assets/javascripts/controllers/searchResults.js @@ -144,7 +144,7 @@ angular.module('QuepidApp') if (parsedQueryDetails.querqy?.rewrite !== undefined) { // jshint ignore:line triggered = true; } - else if ("querqy.infoLog" in parsedQueryDetails){ + else if ('querqy.infoLog' in parsedQueryDetails){ triggered = true; }