Merge branch 'tag-1.4'

Author: weiweishi

Gemfile

@@ -12,7 +12,7 @@ gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'
 gem 'rdf-turtle', '1.1.7'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 4.2'
+gem 'rails', '~> 4.2.7.1'
 
 # Use mysql as the database for Active Record
 gem 'mysql2', '~> 0.3.2'

Gemfile.lock

@@ -17,21 +17,21 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.2)
-    actionmailer (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.2)
-      actionview (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
@@ -55,15 +55,15 @@ GEM
     active_fedora-noid (0.3.0)
       active-fedora (~> 9.0)
       noid (~> 0.7)
-    activejob (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
     activerecord-import (0.10.0)
       activerecord (>= 3.0)
@@ -75,7 +75,7 @@ GEM
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.1)
-    activesupport (4.2.5.2)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -220,7 +220,7 @@ GEM
       railties (>= 3.2, < 5.0)
     foreigner (1.7.4)
       activerecord (>= 3.0.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     google-api-client (0.7.1)
       addressable (>= 2.3.2)
@@ -346,8 +346,8 @@ GEM
     logger (1.2.8)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     mail_form (1.5.1)
       actionmailer (>= 3.2, < 5)
       activemodel (>= 3.2, < 5)
@@ -360,7 +360,7 @@ GEM
     mimemagic (0.3.0)
     mini_magick (4.3.3)
     mini_portile2 (2.1.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
     mono_logger (1.1.0)
     multi_json (1.11.2)
     multi_xml (0.5.5)
@@ -427,16 +427,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5.2)
-      actionmailer (= 4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activerecord (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.2)
+      railties (= 4.2.7.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -450,9 +450,9 @@ GEM
       activemodel (~> 4.0)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
@@ -748,7 +748,7 @@ DEPENDENCIES
   pry
   pry-byebug
   pry-remote
-  rails (~> 4.2)
+  rails (~> 4.2.7.1)
   rdf-turtle (= 1.1.7)
   rest-client
   rsolr (~> 1.0.6)

app/assets/javascripts/modules/homepage.js

@@ -9,13 +9,13 @@ function create_repository_chart() {
 		// hardcoded, out-of-data but reasonable data to use
 		// if something goes wrong in fetching the real time stats
 		initialize_chart({
-			'total_count': '36,675',
+			'total_count': '40,463',
 			'facets': [
-				{indexLabel: "Report", y: 9136},
-				{indexLabel: "Image", y: 5416},
-				{indexLabel: "Thesis", y: 17276},
-				{indexLabel: "Journal Article (Published)", y: 1706},
-				{indexLabel: "Other", y: 1839}
+				{indexLabel: "Report", y: 10078},
+				{indexLabel: "Image", y: 5780},
+				{indexLabel: "Thesis", y: 18999},
+				{indexLabel: "Journal Article (Published)", y: 2303},
+				{indexLabel: "Other", y: 2314}
 			]
 		});
 	});

app/controllers/application_controller.rb

@@ -50,9 +50,9 @@ def gc_stats
 
   def after_sign_in_path_for(resource)
     if current_user.admin?
-      stored_location_for(resource) || root_path
+      stored_location_for(resource) || sufia.dashboard_files_path || root_path
     else
-      stored_location_for(resource) || sufia.dashboard_index_path || root_path
+      stored_location_for(resource) || sufia.dashboard_files_path || root_path
     end
   end
 

app/controllers/catalog_controller.rb

@@ -5,7 +5,6 @@ class CatalogController < ApplicationController
   include Hydra::Catalog
   # Extend Blacklight::Catalog with Hydra behaviors (primarily editing).
   include Sufia::Catalog
-  include Hydranorth::Collections::AdminNestingTargets
 
   # These before_filters apply the hydra access controls
   before_filter :enforce_show_permissions, only: :show
@@ -15,11 +14,6 @@ class CatalogController < ApplicationController
 
   skip_before_filter :default_html_head
 
-  def index
-    @target_collections = admin_target_collections
-    super
-  end
-
   def self.uploaded_field
     solr_name('date_uploaded', :stored_sortable, type: :date)
   end
@@ -156,6 +150,9 @@ def set_solr_search_fields
     config.add_show_field solr_name("fedora3uuid", :stored_searchable), label: "UUID"
 
     config.add_sort_field "score desc, #{uploaded_field} desc", label: "Relevance \u25BC"
+    # TODO: uncomment once a re-index is complete and sortable_title is in Solr
+    #config.add_sort_field "sortable_title_ssi asc", label: "Title A-Z"
+    #config.add_sort_field "sortable_title_ssi desc", label: "Title Z-A"
     config.add_sort_field "#{date_created_field} desc", label: "Date (newest first)"
     config.add_sort_field "#{date_created_field} asc", label: "Date (oldest first)"
     config.add_sort_field "#{uploaded_field} desc", label: "New items"

app/controllers/concerns/hydranorth/batch_controller_behavior.rb

@@ -3,14 +3,10 @@ module BatchControllerBehavior
     extend ActiveSupport::Concern
     include Sufia::BatchControllerBehavior
     include Hydra::Catalog
-    include Hydranorth::Collections::SelectsCollections
+    include Hydranorth::Collections::CollectionSelection
+    include Hydranorth::Collections::CommunitySelection
 
     included do
-      before_action only: [:edit] do
-        find_communities_with_edit_access
-        find_collections_with_edit_access
-      end
-
       class_attribute :edit_form_class, :cstr_edit_form_class, :ser_edit_form_class
       self.edit_form_class = Hydranorth::Forms::BatchEditForm
       self.cstr_edit_form_class = Hydranorth::Forms::CstrBatchEditForm
@@ -19,6 +15,8 @@ module BatchControllerBehavior
 
     def edit
       @batch = Batch.find_or_create(params[:id])
+      @user_communities = find_communities(access_levels[:edit])
+      @user_collections = find_collections(access_levels[:edit])
       @form = edit_form
       @form[:resource_type] = @batch.generic_files.map(&:resource_type).flatten
     end

app/controllers/concerns/hydranorth/batch_edits_controller_behavior.rb

@@ -8,7 +8,7 @@ def redirect_to_return_controller
       if params[:return_controller]
         redirect_to url_for(controller: params[:return_controller], only_path: true)
       else
-        redirect_to sufia.dashboard_index_path
+        redirect_to sufia.dashboard_files_path
       end
     end
 

app/controllers/concerns/hydranorth/collections/admin_collection_selection.rb

@@ -0,0 +1,9 @@
+module Hydranorth::Collections::AdminCollectionSelection
+  extend ActiveSupport::Concern
+  include Hydranorth::Collections::BaseQuery
+
+  def admin_target_collections
+    return [] unless current_user && current_user.admin?
+    perform_collection_query('', nil)
+  end
+end

app/controllers/concerns/hydranorth/collections/admin_nesting_targets.rb

@@ -0,0 +1,25 @@
+module Hydranorth::Collections::BaseQuery
+  extend ActiveSupport::Concern
+  include Blacklight::Catalog
+  include Hydra::Collections::SelectsCollections
+  include Hydranorth::Permissions
+
+  def collections_search_builder_class
+    ::CollectionSearchBuilder
+  end
+
+  def access_levels
+    { read: [:read, :edit], edit: [:edit] }
+  end
+
+  def perform_collection_query(query_string, access_level)
+    authenticate_user! unless access_level.blank?
+
+    # run the solr query to find the collections
+    query = collections_search_builder(access_level).with({q: query_string}).query
+    response = repository.search(query)
+    # return the user's collections (or public collections if no access_level is applied)
+
+    response.documents
+  end
+end

app/controllers/concerns/hydranorth/collections/base_query.rb

@@ -0,0 +1,17 @@
+module Hydranorth::Collections::CollectionSelection
+  extend ActiveSupport::Concern
+  include Hydranorth::Collections::BaseQuery
+
+  def find_collections(access_level = nil)
+    perform_collection_query("(-#{Solrizer.solr_name('is_community', :stored_searchable, type: :boolean)}:true AND -#{Solrizer.solr_name('is_community')}:true) AND (#{Solrizer.solr_name('is_official', :stored_searchable, type: :boolean)}:true OR #{Solrizer.solr_name('is_official')}:true)", access_level)
+  end
+
+  def find_collections_grouped_by_community(access_level = nil)
+    collections = find_collections(access_level)
+    # filter out collections in a community that are nested in a collection
+    collections.reject! {|c| c[Solrizer.solr_name('hasCollection')].present? || c[Solrizer.solr_name('hasCollectionId')].present?}
+    grouped_user_collections = collections.group_by { |c| c[Solrizer.solr_name('belongsToCommunity')] }
+
+    return collections, grouped_user_collections
+  end
+end

app/controllers/concerns/hydranorth/collections/collection_selection.rb

@@ -0,0 +1,18 @@
+module Hydranorth::Collections::CommunitySelection
+  extend ActiveSupport::Concern
+  include Hydranorth::Collections::BaseQuery
+
+  def find_communities(access_level = nil)
+    if access_level.blank?
+      perform_collection_query("(#{Solrizer.solr_name('is_community', :stored_searchable, type: :boolean)}:true OR #{Solrizer.solr_name('is_community')}:true) AND (#{Solrizer.solr_name('is_official', :stored_searchable, type: :boolean)}:true OR #{Solrizer.solr_name('is_official')}:true)", access_level)
+    else
+      perform_collection_query("(#{Solrizer.solr_name('is_community', :stored_searchable, type: :boolean)}:true OR #{Solrizer.solr_name('is_community')}:true) AND (#{Solrizer.solr_name('is_official', :stored_searchable, type: :boolean)}:true OR #{Solrizer.solr_name('is_official')}:true) AND #{Solrizer.solr_name('is_admin_set', :stored_searchable, type: :boolean)}:false", access_level)
+    end
+  end
+
+  # Sorting by title implemented in hydra-collections v7.0.0 [projecthydra/hydra-collections@e8e57e5] this is a workaround
+  def collections_for_community(community_id, access_level = nil)
+    perform_collection_query("#{Solrizer.solr_name('belongsToCommunity')}:#{community_id}", access_level)
+  end
+
+end