diff --git a/Gemfile b/Gemfile index 7bbeb72..011be97 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ group :development do gem 'spring' end -gem 'sufia', '7.1.0' +gem 'sufia', '7.2.0' group :development, :test do gem 'solr_wrapper', '>= 0.3' @@ -61,3 +61,5 @@ group :development, :test do gem 'fcrepo_wrapper' gem 'rspec-rails' end + +gem 'flipflop', git: 'https://github.com/jcoyne/flipflop.git', branch: 'hydra' diff --git a/Gemfile.lock b/Gemfile.lock index ea8d868..d6c63e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/jcoyne/flipflop.git + revision: 0eecddade9890548c92b1e8aa681512f1db01469 + branch: hydra + specs: + flipflop (2.2.1) + activesupport (>= 4.0) + GEM remote: https://rubygems.org/ specs: @@ -20,28 +28,24 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - active-fedora (10.2.1) - active-triples (~> 0.7.1) + active-fedora (11.0.1) + active-triples (~> 0.11.0) activemodel (>= 4.2, < 6) activesupport (>= 4.2.4, < 6) deprecation - ldp (~> 0.5.0) - nom-xml (>= 0.5.1) - om (~> 3.1) - rdf-rdfxml (~> 1.1) - rsolr (~> 1.0, >= 1.0.10) + ldp (~> 0.6.0) + rsolr (~> 1.1, >= 1.1.2) solrizer (~> 3.4) - active-triples (0.7.6) + active-triples (0.11.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) - deprecation (~> 1.0) - linkeddata (~> 1.1) - rdf (~> 1.1) + rdf (~> 2.0, >= 2.0.2) + rdf-vocab active_attr (0.9.0) activemodel (>= 3.0.2, < 5.1) activesupport (>= 3.0.2, < 5.1) - active_fedora-noid (2.0.0.beta2) - active-fedora (>= 9.7, < 11) + active_fedora-noid (2.0.0.beta3) + active-fedora (>= 9.7, < 12) noid (~> 0.9) rails (>= 4.2.6, < 6) activejob (4.2.6) @@ -54,7 +58,7 @@ GEM activemodel (= 4.2.6) activesupport (= 4.2.6) arel (~> 6.0) - activerecord-import (0.15.0) + activerecord-import (0.16.1) activerecord (>= 3.2) activesupport (4.2.6) i18n (~> 0.7) @@ -62,8 +66,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - acts_as_follower (0.2.1) - addressable (2.3.8) + addressable (2.4.0) almond-rails (0.0.3) rails (>= 4.2, < 6) arel (6.0.3) @@ -71,7 +74,7 @@ GEM addressable (>= 2.3.1) extlib (>= 0.9.15) multi_json (>= 1.0.0) - autoprefixer-rails (6.4.0.1) + autoprefixer-rails (6.5.1.1) execjs awesome_nested_set (3.1.1) activerecord (>= 4.0.0, < 5.1) @@ -79,21 +82,19 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bcp47 (0.3.3) - i18n bcrypt (3.1.11) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - blacklight (6.4.1) + blacklight (6.7.2) bootstrap-sass (~> 3.2) deprecation globalid kaminari (>= 0.15) nokogiri (~> 1.6) rails (>= 4.2, < 6) - rsolr (~> 1.0, >= 1.0.6) + rsolr (>= 1.0.6, < 3) twitter-typeahead-rails (= 0.11.1.pre.corejavascript) - blacklight-access_controls (0.5.1) + blacklight-access_controls (0.6.1) blacklight (~> 6.0) cancancan (~> 1.8) deprecation (~> 1.0) @@ -102,15 +103,15 @@ GEM bootstrap-sass (~> 3.0) openseadragon (>= 0.2.0) rails - blacklight_advanced_search (6.0.2) + blacklight_advanced_search (6.1.0) blacklight (~> 6.0, >= 6.0.1) parslet blankslate (3.1.3) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - breadcrumbs_on_rails (3.0.0) - browse-everything (0.10.4) + breadcrumbs_on_rails (3.0.1) + browse-everything (0.10.5) bootstrap-sass dropbox-sdk (>= 1.6.2) font-awesome-rails @@ -130,7 +131,7 @@ GEM json (>= 1.7) mime-types (>= 1.16) mimemagic (>= 0.3.0) - clipboard-rails (1.5.10) + clipboard-rails (1.5.15) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) @@ -139,19 +140,19 @@ GEM execjs coffee-script-source (1.10.0) concurrent-ruby (1.0.2) - curation_concerns (1.3.3) - active-fedora (>= 10.0.0, < 11.a) + curation_concerns (1.6.3) + active-fedora (>= 10.3.0.rc1) active_attr active_fedora-noid (~> 2.0.0.beta1) awesome_nested_set (~> 3.0) blacklight (~> 6.3) blacklight_advanced_search (~> 6.0) - breadcrumbs_on_rails (>= 2.3, < 4) + breadcrumbs_on_rails (>= 3.0.1, < 4) browse-everything (~> 0.10) clipboard-rails (~> 1.5) hydra-editor (>= 2, < 4) hydra-head (>= 10.0.0, < 11) - hydra-works (>= 0.12.0) + hydra-works (>= 0.14.0) jquery-ui-rails kaminari_route_prefix (~> 0.0.1) qa (~> 0.5) @@ -177,11 +178,9 @@ GEM diff-lcs (1.2.5) dropbox-sdk (1.6.5) json - ebnf (1.0.0) - rdf (~> 1.1) - sxp (~> 0.1, >= 0.1.3) - equivalent-xml (0.6.0) - nokogiri (>= 1.4.3) + ebnf (1.0.1) + rdf (~> 2.0) + sxp (~> 1.0) erubis (2.7.0) execjs (2.7.0) extlib (0.9.16) @@ -189,14 +188,14 @@ GEM multipart-post (>= 1.2, < 3) fcrepo_wrapper (0.5.2) ruby-progressbar - flot-rails (0.0.6) + flot-rails (0.0.7) jquery-rails - font-awesome-rails (4.6.3.1) + font-awesome-rails (4.7.0.0) railties (>= 3.2, < 5.1) globalid (0.3.7) activesupport (>= 4.1.0) - google-api-client (0.8.6) - activesupport (>= 3.2) + google-api-client (0.8.7) + activesupport (>= 3.2, < 5.0) addressable (~> 2.3) autoparse (~> 0.3) extlib (~> 0.9) @@ -221,6 +220,8 @@ GEM signet (~> 0.7) haml (4.0.7) tilt + hamster (3.0.0) + concurrent-ruby (~> 1.0) hiredis (0.6.1) htmlentities (4.3.4) httmultiparty (0.3.16) @@ -230,27 +231,27 @@ GEM http_logger (0.5.1) httparty (0.14.0) multi_xml (>= 0.5.2) - hydra-access-controls (10.1.0) - active-fedora (>= 10.0.0.beta1, < 11) + hydra-access-controls (10.3.0) + active-fedora (>= 10.0.0, < 12) activesupport (>= 4, < 6) blacklight (>= 5.16) - blacklight-access_controls (~> 0.5) + blacklight-access_controls (~> 0.6) cancancan (~> 1.8) deprecation (~> 1.0) - hydra-batch-edit (2.0.2) + hydra-batch-edit (2.1.0) blacklight curation_concerns (>= 0.12.0.pre2) rails - hydra-core (10.1.0) - hydra-access-controls (= 10.1.0) + hydra-core (10.3.0) + hydra-access-controls (= 10.3.0) railties (>= 4.0.0, < 6) - hydra-derivatives (3.1.2) - active-fedora (>= 9.0, < 11) + hydra-derivatives (3.1.4) + active-fedora (>= 9.0, < 12) activesupport (>= 4.0, < 6) deprecation mime-types (> 2.0, < 4.0) mini_magick (>= 3.2, < 5) - hydra-editor (3.1.0) + hydra-editor (3.1.2) active-fedora (>= 9.0.0) almond-rails (~> 0.0.3) cancancan (~> 1.8) @@ -259,34 +260,40 @@ GEM sprockets-es6 hydra-file_characterization (0.3.3) activesupport (>= 3.0.0) - hydra-head (10.1.0) - hydra-access-controls (= 10.1.0) - hydra-core (= 10.1.0) + hydra-head (10.3.0) + hydra-access-controls (= 10.3.0) + hydra-core (= 10.3.0) rails (>= 3.2.6) - hydra-pcdm (0.8.2) + hydra-pcdm (0.9.0) active-fedora (>= 10, < 12) mime-types (>= 1) - hydra-works (0.12.0) + hydra-works (0.14.0) hydra-derivatives (~> 3.0) hydra-file_characterization (~> 0.3, >= 0.3.3) hydra-pcdm (>= 0.8) + om (~> 3.1) i18n (0.7.0) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jquery-rails (4.1.1) + jquery-datatables-rails (3.3.0) + actionpack (>= 3.1) + jquery-rails + railties (>= 3.1) + sass-rails + jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) - json-ld (1.99.2) + json-ld (2.1.0) multi_json (~> 1.11) - rdf (~> 1.99) - json-schema (2.6.2) - addressable (~> 2.3.8) - jwt (1.5.4) + rdf (~> 2.1) + json-schema (2.7.0) + addressable (>= 2.4) + jwt (1.5.6) kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -294,38 +301,20 @@ GEM kaminari (>= 0.16, < 2) launchy (2.4.3) addressable (~> 2.3) - ldp (0.5.0) + ldp (0.6.1) deprecation faraday http_logger - linkeddata (>= 1.1) - rdf-vocab + json-ld + rdf (>= 1.1) + rdf-isomorphic + rdf-turtle + rdf-vocab (>= 0.8) slop legato (0.7.0) multi_json libv8 (3.16.14.15) link_header (0.0.8) - linkeddata (1.99.0) - equivalent-xml (~> 0.6) - json-ld (~> 1.99) - nokogiri (~> 1.6) - rdf (~> 1.99) - rdf-aggregate-repo (~> 1.99) - rdf-isomorphic (~> 1.99) - rdf-json (~> 1.1, >= 1.1.2) - rdf-microdata (~> 2.0, >= 2.0.2) - rdf-n3 (~> 1.99) - rdf-rdfa (~> 1.99) - rdf-rdfxml (~> 1.1, >= 1.1.5) - rdf-reasoner (~> 0.3) - rdf-tabular (~> 0.3) - rdf-trig (~> 1.99, >= 1.99.0.1) - rdf-trix (~> 1.99) - rdf-turtle (~> 1.99) - rdf-vocab (~> 0.8, >= 0.8.6) - rdf-xsd (~> 1.1, >= 1.1.5) - sparql (~> 1.99) - sparql-client (~> 1.99) little-plugger (1.1.4) logging (2.1.0) little-plugger (~> 1.1) @@ -334,41 +323,32 @@ GEM nokogiri (>= 1.5.9) mail (2.6.4) mime-types (>= 1.16, < 4) - mail_form (1.5.1) - actionmailer (>= 3.2, < 5) - activemodel (>= 3.2, < 5) mailboxer (0.14.0) carrierwave (>= 0.5.8) rails (>= 4.2.0) - memoist (0.14.0) + memoist (0.15.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) mini_magick (4.5.1) mini_portile2 (2.1.0) - minitest (5.9.0) + minitest (5.9.1) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) nest (2.0.0) redic - net-http-persistent (2.9.4) noid (0.9.0) - nokogiri (1.6.8) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - nom-xml (0.5.4) - activesupport (>= 3.2.18) - i18n - nokogiri oauth (0.5.1) - oauth2 (0.9.4) + oauth2 (1.2.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) + rack (>= 1.2, < 3) om (3.1.1) activemodel activesupport @@ -380,9 +360,8 @@ GEM os (0.9.6) parslet (1.7.1) blankslate (>= 2.0, <= 4.0) - pkg-config (1.1.7) posix-spawn (0.3.11) - qa (0.9.0) + qa (0.10.2) activerecord-import deprecation faraday @@ -417,58 +396,32 @@ GEM activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.2.2) - rdf (1.99.1) + rake (11.3.0) + rdf (2.1.0) + hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) - rdf-aggregate-repo (1.99.0) - rdf (~> 1.99) - rdf-isomorphic (1.99.0) - rdf (~> 1.99) - rdf-json (1.99.0) - rdf (~> 1.99) - rdf-microdata (2.0.2) - htmlentities (~> 4.3) - nokogiri (~> 1.6) - rdf (~> 1.1) - rdf-xsd (~> 1.1) - rdf-n3 (1.99.0) - rdf (~> 1.99) - rdf-rdfa (1.99.1) + rdf-aggregate-repo (2.0.0) + rdf (~> 2.0) + rdf-isomorphic (2.0.0) + rdf (~> 2.0) + rdf-rdfa (2.0.1) haml (~> 4.0) htmlentities (~> 4.3) - rdf (~> 1.99) - rdf-aggregate-repo (~> 1.1) - rdf-xsd (~> 1.1) - rdf-rdfxml (1.99.0) + rdf (~> 2.0) + rdf-aggregate-repo (~> 2.0) + rdf-xsd (~> 2.0) + rdf-rdfxml (2.0.0) htmlentities (~> 4.3) - rdf (~> 1.99) - rdf-rdfa (~> 1.99) - rdf-xsd (~> 1.99) - rdf-reasoner (0.3.0) - rdf (~> 1.1, >= 1.1.4.2) - rdf-turtle (~> 1.1) - rdf-vocab (~> 0.8) - rdf-xsd (~> 1.1) - rdf-tabular (0.3.0) - addressable (~> 2.3) - bcp47 (~> 0.3, >= 0.3.3) - json-ld (~> 1.1) - rdf (~> 1.1, >= 1.1.7) - rdf-vocab (~> 0.8) - rdf-xsd (~> 1.1) - rdf-trig (1.99.0.1) - ebnf (~> 1.0) - rdf (~> 1.99) - rdf-turtle (~> 1.99) - rdf-trix (1.99.0) - rdf (~> 1.1) - rdf-turtle (1.99.0) - ebnf (~> 1.0) - rdf (~> 1.99) - rdf-vocab (0.8.8) - rdf (~> 1.1, >= 1.1.10) - rdf-xsd (1.99.0) - rdf (~> 1.99) + rdf (~> 2.0) + rdf-rdfa (~> 2.0) + rdf-xsd (~> 2.0) + rdf-turtle (2.0.0) + ebnf (~> 1.0, >= 1.0.1) + rdf (~> 2.0) + rdf-vocab (2.1.0) + rdf (~> 2.1) + rdf-xsd (2.0.0) + rdf (~> 2.0) rdoc (4.2.2) json (~> 1.4) redic (1.5.0) @@ -482,7 +435,7 @@ GEM responders (2.2.0) railties (>= 4.2.0, < 5.1) retriable (1.4.1) - rsolr (1.1.1) + rsolr (1.1.2) builder (>= 2.1.2) rspec-core (3.5.2) rspec-support (~> 3.5.0) @@ -525,7 +478,7 @@ GEM faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) - simple_form (3.2.1) + simple_form (3.3.1) actionpack (> 4, < 5.1) activemodel (> 4, < 5.1) skydrive (1.2.0) @@ -533,7 +486,7 @@ GEM httmultiparty httparty (>= 0.11.0) oauth2 (>= 0.9.2) - slop (4.3.0) + slop (4.4.1) solr_wrapper (0.18.0) faraday ruby-progressbar @@ -544,66 +497,59 @@ GEM nokogiri stomp xml-simple - sparql (1.99.1) - builder (~> 3.2) - ebnf (~> 1.0) - rdf (~> 1.99) - rdf-aggregate-repo (~> 1.99) - rdf-xsd (~> 1.1) - sparql-client (~> 1.1) - sxp (~> 0.1) - sparql-client (1.99.0) - net-http-persistent (~> 2.9) - rdf (~> 1.1) spring (1.7.2) sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.1) + sprockets-es6 (0.9.2) babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sprockets-rails (3.1.1) + sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.11) - stomp (1.4.1) - sufia (7.1.0) - acts_as_follower (>= 0.1.1, < 0.3) + stomp (1.4.3) + sufia (7.2.0) almond-rails (~> 0.0.1) + blacklight (~> 6.6) blacklight-gallery (~> 0.1) browse-everything (>= 0.10.3) carrierwave (~> 0.9) - curation_concerns (~> 1.3, >= 1.3.3) + curation_concerns (~> 1.6, >= 1.6.1) daemons (~> 1.1) + flipflop (~> 2.2) flot-rails (~> 0.0.6) font-awesome-rails (~> 4.2) - google-api-client (~> 0.7, < 0.9) hydra-batch-edit (~> 2.0) + hydra-head (>= 10.1) + jquery-datatables-rails (~> 3.3.0) jquery-ui-rails (~> 5.0) json-schema legato (~> 0.3) - mail_form (~> 1.5) mailboxer (~> 0.12) nest (~> 2.0) oauth - oauth2 (~> 0.9) + oauth2 (~> 1.2) posix-spawn qa (~> 0.8) + rdf-rdfxml redis-namespace (~> 1.5.2) select2-rails (~> 3.5.9) + signet tinymce-rails (~> 4.1) tinymce-rails-imageupload (~> 4.0.16.beta) yaml_db (~> 0.2) - sxp (0.1.5) + sxp (1.0.0) + rdf (~> 2.0) therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref thor (0.19.1) thread_safe (0.3.5) tilt (2.0.5) - tinymce-rails (4.4.1) + tinymce-rails (4.4.3) railties (>= 3.1.1) tinymce-rails-imageupload (4.0.17.beta) railties (>= 3.2, < 6) @@ -627,7 +573,7 @@ GEM railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) xml-simple (1.1.5) - yaml_db (0.4.0) + yaml_db (0.4.2) rails (>= 3.0, < 5.1) rake (>= 0.8.7) @@ -640,6 +586,7 @@ DEPENDENCIES devise devise-guests (~> 0.3) fcrepo_wrapper + flipflop! jbuilder (~> 2.0) jquery-rails rails (= 4.2.6) @@ -650,7 +597,7 @@ DEPENDENCIES solr_wrapper (>= 0.3) spring sqlite3 - sufia (= 7.1.0) + sufia (= 7.2.0) therubyracer turbolinks uglifier (>= 1.3.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0f1349c..ee74e6c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,6 +12,8 @@ // //= require jquery //= require jquery_ujs +//= require dataTables/jquery.dataTables +//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap //= require turbolinks// // Required by Blacklight //= require blacklight/blacklight diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f9cd5b3..c5198f4 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -11,5 +11,6 @@ * file per style scope. * *= require_tree . + *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap *= require_self */ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 79162e5..5d9608b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -10,7 +10,6 @@ class ApplicationController < ActionController::Base include Sufia::Controller include CurationConcerns::ThemedLayoutController - layout 'sufia-one-column' # Prevent CSRF attacks by raising an exception. diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index b76419b..013cd49 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -6,7 +6,6 @@ class CatalogController < ApplicationController # These before_filters apply the hydra access controls before_filter :enforce_show_permissions, only: :show - skip_before_filter :default_html_head def self.uploaded_field solr_name('system_create', :stored_sortable, type: :date) @@ -71,8 +70,8 @@ def self.modified_field config.add_index_field solr_name("description", :stored_searchable), label: "Description", itemprop: 'description', helper_method: :iconify_auto_link config.add_index_field solr_name("keyword", :stored_searchable), label: "Keyword", itemprop: 'keywords', link_to_search: solr_name("keyword", :facetable) config.add_index_field solr_name("gw_affiliation", :stored_searchable), label: "GW Unit", itemprop: 'gw_affiliation', link_to_search: solr_name("gw_affiliation", :facetable) - config.add_index_field solr_name("date_uploaded", :stored_sortable, type: :date), label: "Date Uploaded", itemprop: 'datePublished' - config.add_index_field solr_name("date_created", :stored_searchable), label: "Date Created", itemprop: 'dateCreated' + config.add_index_field solr_name("date_uploaded", :stored_sortable, type: :date), label: "Date Uploaded", itemprop: 'datePublished', helper_method: :human_readable_date + config.add_index_field solr_name("date_created", :stored_searchable), label: "Date Created", itemprop: 'dateCreated', helper_method: :human_readable_date # solr fields to be displayed in the show (single result) view # The ordering of the field names is the order of the display diff --git a/app/controllers/curation_concerns/works_controller.rb b/app/controllers/curation_concerns/works_controller.rb index cc48471..c3f00e1 100644 --- a/app/controllers/curation_concerns/works_controller.rb +++ b/app/controllers/curation_concerns/works_controller.rb @@ -3,7 +3,7 @@ module CurationConcerns class WorksController < ApplicationController - include CurationConcerns::CurationConcernController + include CurationConcerns::CurationConcernController # Adds Sufia behaviors to the controller. include Sufia::WorksControllerBehavior diff --git a/config/authorities/rights.yml b/config/authorities/licenses.yml similarity index 100% rename from config/authorities/rights.yml rename to config/authorities/licenses.yml diff --git a/config/initializers/sufia.rb b/config/initializers/sufia.rb index 1ef8227..e9cc5d2 100644 --- a/config/initializers/sufia.rb +++ b/config/initializers/sufia.rb @@ -91,10 +91,18 @@ # The user who runs audit jobs. Update this if you aren't using emails # config.audit_user_key = 'audituser@example.com' + # + # The banner image. Should be 5000px wide by 1000px tall. + # config.banner_image = 'https://cloud.githubusercontent.com/assets/92044/18370978/88ecac20-75f6-11e6-8399-6536640ef695.jpg' + # Temporary path to hold uploads before they are ingested into FCrepo. # This must be a lambda that returns a Pathname # config.upload_path = ->() { Rails.root + 'tmp' + 'uploads' } + # Location on local file system where derivatives will be stored. + # If you use a multi-server architecture, this MUST be a shared volume. + # config.derivatives_path = File.join(Rails.root, 'tmp', 'derivatives') + # If browse-everything has been configured, load the configs. Otherwise, set to nil. begin if defined? BrowseEverything diff --git a/db/schema.rb b/db/schema.rb index 27b0a0c..22f472d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160720212240) do +ActiveRecord::Schema.define(version: 20161027140103) do create_table "bookmarks", force: :cascade do |t| t.integer "user_id", null: false @@ -118,19 +118,6 @@ add_index "file_view_stats", ["file_id"], name: "index_file_view_stats_on_file_id" add_index "file_view_stats", ["user_id"], name: "index_file_view_stats_on_user_id" - create_table "follows", force: :cascade do |t| - t.integer "followable_id", null: false - t.string "followable_type", null: false - t.integer "follower_id", null: false - t.string "follower_type", null: false - t.boolean "blocked", default: false, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "follows", ["followable_id", "followable_type"], name: "fk_followables" - add_index "follows", ["follower_id", "follower_type"], name: "fk_follows" - create_table "local_authorities", force: :cascade do |t| t.string "name" end @@ -268,6 +255,13 @@ add_index "subject_local_authority_entries", ["lowerLabel"], name: "entries_by_lower_label" + create_table "sufia_features", force: :cascade do |t| + t.string "key", null: false + t.boolean "enabled", default: false, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "tinymce_assets", force: :cascade do |t| t.string "file" t.datetime "created_at", null: false diff --git a/solr/config/solrconfig.xml b/solr/config/solrconfig.xml index e5c5b2d..db58c2e 100644 --- a/solr/config/solrconfig.xml +++ b/solr/config/solrconfig.xml @@ -187,6 +187,17 @@ + + + + + true + + + termsComponent + + + -