From 0f68be29e36e13e2cfa373ddc882d97b7a0a8a0e Mon Sep 17 00:00:00 2001
From: jendiamond <thejendiamond@gmail.com>
Date: Tue, 29 Oct 2019 22:30:34 -0700
Subject: [PATCH] Update jQuery to secure version

Connected to [URS-495](https://jira.library.ucla.edu/browse/URS-495)

---

Changes to be committed:
modified:   app/assets/javascripts/application.js
modified:   Gemfile
modified:   Gemfile.lock
modified:   app/views/catalog/_index.html.erb
---
 Gemfile                               | 2 +-
 Gemfile.lock                          | 2 +-
 app/assets/javascripts/application.js | 4 ++--
 app/views/catalog/_index.html.erb     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 388188e40..7d4a19ea9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -83,7 +83,7 @@ gem 'devise-guests', '~> 0.7', '>= 0.7.0'
 gem 'flipflop'
 gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2'
 gem 'httparty'
-gem 'jquery-rails'
+gem 'jquery-rails', '~> 4.3', '>= 4.3.1'
 gem 'loofah', '>= 2.2.3'
 gem 'rsolr', '>= 1.0'
 gem 'solrizer'
diff --git a/Gemfile.lock b/Gemfile.lock
index aa903c30a..6e5788f88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -429,7 +429,7 @@ DEPENDENCIES
   flipflop
   font-awesome-rails (~> 4.7, >= 4.7.0.2)
   httparty
-  jquery-rails
+  jquery-rails (~> 4.3, >= 4.3.1)
   listen (>= 3.0.5, < 3.2)
   loofah (>= 2.2.3)
   mysql2 (~> 0.5)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 2874bc40c..3ae264428 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -10,13 +10,13 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require rails-ujs
 //= require turbolinks
 //
 
 //= require tether
 // Required by Blacklight
-//= require jquery
+//= require jquery3
+//= require jquery_ujs
 //= require popper
 //= require bootstrap
 //= require blacklight/blacklight
diff --git a/app/views/catalog/_index.html.erb b/app/views/catalog/_index.html.erb
index 06f2637df..196dbced7 100644
--- a/app/views/catalog/_index.html.erb
+++ b/app/views/catalog/_index.html.erb
@@ -6,7 +6,7 @@
   <% doc_presenter.fields_to_render.each do | field_name, field | -%>
     <dt class="blacklight-<%= field_name.parameterize %> col-md-3"><%= render_index_field_label document, field: field_name %></dt>
     <dd class="blacklight-<%= field_name.parameterize %> col-md-9"><%= doc_presenter.field_value field %></dd>
-    <% if field_name = "Description" %>
+    <% if field_name == "Description" %>
       <dt class="blacklight-<%= field_name.parameterize %> col-md-3"></dt>
       <dd class="blacklight-<%= field_name.parameterize %> col-md-9">&nbsp;&nbsp;&nbsp;</dd>
     <% end %>