Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update to hyrax 2.2 #1543

Merged
4 commits merged into from
Oct 4, 2018
Merged

update to hyrax 2.2 #1543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87d3266
update to hyrax 2.2
orangewolf Aug 22, 2018
6579a09
Creative Commons License in main fields when adding a new work (#1525)
cldambrosio Oct 4, 2018
a2e369e
Merge branch 'upstream_master' into hyrax_2_2
orangewolf Oct 4, 2018
77d45db
Merge remote-tracking branch 'upstream/collection_type' into hyrax_2_2
orangewolf Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ end

gem 'blacklight', '~> 6.7'

gem 'hyrax', '2.1.0'
gem 'hyrax', '2.2.0'
gem 'rsolr', '~> 2.0'

gem 'devise'
Expand Down
29 changes: 12 additions & 17 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GEM
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activerecord-import (0.24.0)
activerecord-import (0.25.0)
activerecord (>= 3.2)
activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -107,7 +107,7 @@ GEM
blacklight (~> 6.0)
cancancan (~> 1.8)
deprecation (~> 1.0)
blacklight-gallery (0.10.0)
blacklight-gallery (0.11.0)
blacklight (~> 6.3)
bootstrap-sass (~> 3.0)
openseadragon (>= 0.2.0)
Expand Down Expand Up @@ -213,7 +213,7 @@ GEM
dry-container (~> 0.2, >= 0.2.6)
dry-core (~> 0.2)
dry-equalizer (~> 0.2)
dry-struct (0.5.0)
dry-struct (0.5.1)
dry-core (~> 0.4, >= 0.4.3)
dry-equalizer (~> 0.2)
dry-types (~> 0.13)
Expand Down Expand Up @@ -266,7 +266,7 @@ GEM
railties (>= 3.2, < 6.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
google-api-client (0.23.0)
google-api-client (0.23.4)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.5, < 0.7.0)
httpclient (>= 2.8.1, < 3.0)
Expand All @@ -277,13 +277,12 @@ GEM
google-api-client (>= 0.11.0, < 1.0.0)
googleauth (>= 0.5.0, < 1.0.0)
nokogiri (>= 1.5.3, < 2.0.0)
googleauth (0.6.2)
googleauth (0.6.5)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
os (>= 0.9, < 2.0)
signet (~> 0.7)
haml (5.0.4)
temple (>= 0.8.0)
Expand Down Expand Up @@ -342,14 +341,14 @@ GEM
hydra-file_characterization (~> 0.3, >= 0.3.3)
hydra-pcdm (>= 0.9)
om (~> 3.1)
hyrax (2.1.0)
hyrax (2.2.0)
active-fedora (~> 11.5, >= 11.5.2)
almond-rails (~> 0.1)
awesome_nested_set (~> 3.1)
blacklight (~> 6.14)
blacklight-gallery (~> 0.7)
breadcrumbs_on_rails (~> 3.0)
browse-everything (>= 0.10.5)
browse-everything (< 0.16)
carrierwave (~> 1.0)
clipboard-rails (~> 1.5)
dry-equalizer (~> 0.2)
Expand Down Expand Up @@ -501,10 +500,6 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
lograge (0.5.1)
actionpack (>= 4, < 5.2)
activesupport (>= 4, < 5.2)
Expand Down Expand Up @@ -564,7 +559,7 @@ GEM
openseadragon (0.5.0)
rails (> 3.2.0)
orm_adapter (0.5.0)
os (0.9.6)
os (1.0.0)
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
Expand Down Expand Up @@ -793,7 +788,7 @@ GEM
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
redis (~> 3.3, >= 3.3.3)
signet (0.8.1)
signet (0.9.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
Expand Down Expand Up @@ -862,7 +857,7 @@ GEM
thread_safe (0.3.6)
tilt (2.0.8)
tins (1.14.0)
tinymce-rails (4.7.13)
tinymce-rails (4.8.2)
railties (>= 3.1.1)
turbolinks (5.0.1)
turbolinks-source (~> 5)
Expand Down Expand Up @@ -923,7 +918,7 @@ DEPENDENCIES
fcrepo_wrapper (~> 0.4)
flipflop (~> 2.3)
honeybadger (~> 3.0)
hyrax (= 2.1.0)
hyrax (= 2.2.0)
i18n-debug
i18n-tasks
iiif_manifest (~> 0.3.0)
Expand Down
6 changes: 5 additions & 1 deletion lib/importer/factory/object_factory.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ def update
end

def create_attributes
{ collection_type: collection_type }.merge(transform_attributes)
if klass == Collection
{ collection_type: collection_type }.merge(transform_attributes)
else
transform_attributes
end
end

def update_attributes
Expand Down