Merge branch 'release-4-9-3'

Author: Jim Coble

Gemfile

@@ -4,8 +4,8 @@ ruby '2.3.1'
 gem 'rails', '4.2.7'
 
 gem 'ddr-alerts', '1.1.0'
-gem 'ddr-batch', '1.6.0'
-gem 'ddr-models', '2.10.1'
+gem 'ddr-batch', '1.6.1'
+gem 'ddr-models', '2.10.2'
 
 gem 'hydra-head', '7.2.2'
 gem 'blacklight', '5.19.2'
@@ -30,7 +30,7 @@ gem 'therubyracer', require: 'v8', group: :production
 # For mapping file extensions to MIME types
 gem 'mime-types', '~> 2.6'
 
-gem 'paperclip', '~> 4.2'
+gem 'paperclip', '~> 5.2'
 
 # Filesystem representation
 gem 'rubytree'

Gemfile.lock

@@ -96,7 +96,7 @@ GEM
       xpath (~> 2.0)
     childprocess (0.6.1)
       ffi (~> 1.0, >= 1.0.11)
-    climate_control (0.1.0)
+    climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coercible (1.0.0)
@@ -107,13 +107,13 @@ GEM
     ddr-alerts (1.1.0)
       rails (~> 4.2)
     ddr-antivirus (2.1.1)
-    ddr-batch (1.6.0)
+    ddr-batch (1.6.1)
       ddr-models (~> 2.10)
       devise (~> 3.4)
       log4r
-      paperclip (~> 4.2.0)
+      paperclip (~> 5.2)
       rails (~> 4.1)
-    ddr-models (2.10.1)
+    ddr-models (2.10.2)
       active-fedora (>= 7.3.1, < 8)
       activeresource
       cancancan (~> 1.12)
@@ -257,7 +257,8 @@ GEM
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     mime-types (2.99.3)
-    mini_portile2 (2.1.0)
+    mimemagic (0.3.2)
+    mini_portile2 (2.3.0)
     minitest (5.10.1)
     mono_logger (1.1.0)
     multi_json (1.12.1)
@@ -267,8 +268,8 @@ GEM
     net-http-persistent (2.9.4)
     net-ldap (0.16.1)
     netrc (0.11.0)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
     nom-xml (0.6.0)
       activesupport (>= 3.2.18)
       i18n
@@ -287,14 +288,15 @@ GEM
       capybara (>= 1.1)
       rspec (>= 2.14)
     orm_adapter (0.5.0)
-    paperclip (4.2.4)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
+    paperclip (5.2.1)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
+      mimemagic (~> 0.3.0)
     public_suffix (2.0.5)
     rack (1.6.5)
-    rack-protection (1.5.3)
+    rack-protection (1.5.5)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -518,8 +520,8 @@ DEPENDENCIES
   capybara (~> 2.0)
   database_cleaner
   ddr-alerts (= 1.1.0)
-  ddr-batch (= 1.6.0)
-  ddr-models (= 2.10.1)
+  ddr-batch (= 1.6.1)
+  ddr-models (= 2.10.2)
   deprecation
   devise
   equivalent-xml
@@ -534,7 +536,7 @@ DEPENDENCIES
   mysql2 (~> 0.4.5)
   nest (= 1.1.2)
   orderly
-  paperclip (~> 4.2)
+  paperclip (~> 5.2)
   rails (= 4.2.7)
   responders (~> 2.0)
   resque (= 1.25.2)

app/views/admin_metadata_form/_admin_set.html.erb

@@ -1,2 +1,2 @@
 <%= f.label :admin_set, "Admin Set" %>
-<%= f.select :admin_set, admin_set_options_for_select, {include_blank: "N/A"}, {class: "form-control"} %>
+<%= f.select :admin_set, admin_set_options_for_select, {class: "form-control"} %>

app/views/application/_object_summary.html.erb

@@ -14,9 +14,9 @@
       <%= current_object.class.to_s %> <%= current_object.pid %><br/>
       <hr/>
     </li>
-    <% if current_object.respond_to?(:identifier) && current_object.identifier.present? %>
+    <% if current_document.local_id.present? %>
       <li class="small">
-        <%= current_object.identifier.first %>
+        <%= current_document.local_id %>
       </li>
     <% end %>
     <% if current_document.has_content? %>

lib/dul_hydra/version.rb

@@ -1,3 +1,3 @@
 module DulHydra
-  VERSION = "4.9.2"
+  VERSION = "4.9.3"
 end