sufia 6.0.0.rc4 → 6.0.0

data/app/controllers/concerns/sufia/homepage_controller.rb

@@ -6,9 +6,10 @@ module Sufia::HomepageController
     include Hydra::Controller::ControllerBehavior
     include Blacklight::Catalog::SearchContext
     include Sufia::Controller
-    include Blacklight::SolrHelper
+    include Blacklight::SearchHelper
+    include Hydra::Controller::SearchBuilder
 
-    self.solr_search_params_logic += [:only_generic_files, :add_access_controls_to_solr_params]
+    self.search_params_logic += [:show_only_generic_files, :add_access_controls_to_solr_params]
     layout 'homepage'
   end
 
@@ -24,19 +25,11 @@ module Sufia::HomepageController
 
   def recent
     # grab any recent documents
-    (_, @recent_documents) = get_search_results(q: '', sort:sort_field, rows: 4)
+    (_, @recent_documents) = search_results({q: '', sort:sort_field, rows: 4}, search_params_logic)
   end
 
   def sort_field
     "#{Solrizer.solr_name('system_create', :stored_sortable, type: :date)} desc"
   end
 
-  # Limits search results just to GenericFiles
-  # @param solr_parameters the current solr parameters
-  # @param user_parameters the current user-subitted parameters
-  def only_generic_files(solr_parameters, user_parameters)
-    solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:\"GenericFile\""
-  end
-
 end

data/app/controllers/concerns/sufia/my_controller_behavior.rb

@@ -3,7 +3,7 @@ require 'blacklight/catalog'
 module Sufia
   module MyControllerBehavior
     extend ActiveSupport::Concern
-    include Blacklight::Catalog
+    include Hydra::Catalog
     include Hydra::BatchEditBehavior
     include Hydra::Collections::SelectsCollections
   
@@ -11,17 +11,13 @@ module Sufia
       include Blacklight::Configurable
 
       self.copy_blacklight_config_from(CatalogController)
-
-      include BlacklightAdvancedSearch::ParseBasicQ
-      include BlacklightAdvancedSearch::Controller
       
       before_filter :authenticate_user!
       before_filter :enforce_show_permissions, only: :show
       before_filter :enforce_viewing_context_for_show_requests, only: :show
       before_filter :find_collections, only: :index
 
-      # This applies appropriate access controls to all solr queries (the internal method of this is overidden bellow to only include edit files)
-      self.solr_search_params_logic += [:add_access_controls_to_solr_params]
+      self.search_params_logic += [:add_access_controls_to_solr_params, :add_advanced_parse_q_to_solr]
 
       layout 'sufia-dashboard'
     end
@@ -33,7 +29,7 @@ module Sufia
     end
 
     def index
-      (@response, @document_list) = get_search_results
+      (@response, @document_list) = search_results(params, search_params_logic)
       @user = current_user
       @events = @user.events(100)
       @last_event_timestamp = @user.events.first[:timestamp].to_i || 0 rescue 0
@@ -65,19 +61,5 @@ module Sufia
       ["edit"]
     end
 
-    def show_only_files_deposited_by_current_user solr_parameters, user_parameters
-      solr_parameters[:fq] ||= []
-      solr_parameters[:fq] += [
-        ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: current_user.user_key)
-      ]
-    end
-
-    def show_only_generic_files solr_parameters, user_parameters
-      solr_parameters[:fq] ||= []
-      solr_parameters[:fq] += [
-        ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::GenericFile.to_class_uri)
-      ]
-    end
-
   end
 end

data/app/controllers/concerns/sufia/transfers_controller_behavior.rb

@@ -5,7 +5,7 @@ module Sufia
     included do
       before_action :load_proxy_deposit_request, only: :create
       load_and_authorize_resource :proxy_deposit_request, parent: false, except: :index
-      before_action :get_pid_and_authorize_depositor, only: [:new, :create]
+      before_action :get_id_and_authorize_depositor, only: [:new, :create]
       # Catch permission errors
       # TODO we should make this a module in Sufia
       rescue_from CanCan::AccessDenied do |exception|
@@ -19,7 +19,7 @@ module Sufia
     end
 
     def new
-      @generic_file = ::GenericFile.load_instance_from_solr(@pid)
+      @generic_file = ::GenericFile.load_instance_from_solr(@id)
     end
 
     def create
@@ -56,10 +56,10 @@ module Sufia
 
     private
 
-    def get_pid_and_authorize_depositor
-      @pid = params[:id]
-      authorize! :transfer, @pid
-      @proxy_deposit_request.pid = @pid
+    def get_id_and_authorize_depositor
+      @id = params[:id]
+      authorize! :transfer, @id
+      @proxy_deposit_request.generic_file_id = @id
     rescue CanCan::AccessDenied
       redirect_to root_url, alert: 'You are not authorized to transfer this file'
     end

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -6,9 +6,10 @@ module Sufia::UsersControllerBehavior
     layout "sufia-one-column"
     prepend_before_filter :find_user, except: [:index, :search, :notifications_number]
     before_filter :authenticate_user!, only: [:edit, :update, :follow, :unfollow, :toggle_trophy]
-    before_filter :user_is_current_user, only: [:edit, :update, :toggle_trophy]
-
     before_filter :user_not_current_user, only: [:follow, :unfollow]
+    authorize_resource only: [:edit, :update, :toggle_trophy]
+    # Catch permission errors
+    rescue_from CanCan::AccessDenied, with: :deny_access
   end
 
   def index
@@ -41,7 +42,6 @@ module Sufia::UsersControllerBehavior
 
   # Display form for users to edit their profile information
   def edit
-    @user = current_user
     @trophies = @user.trophy_files
   end
 
@@ -125,10 +125,6 @@ module Sufia::UsersControllerBehavior
     redirect_to root_path, alert: "User '#{params[:id]}' does not exist" if @user.nil?
   end
 
-  def user_is_current_user
-    redirect_to sufia.profile_path(@user.to_param), alert: "Permission denied: cannot access this page." unless @user == current_user
-  end
-
   def user_not_current_user
     redirect_to sufia.profile_path(@user.to_param), alert: "You cannot follow or unfollow yourself" if @user == current_user
   end
@@ -142,4 +138,8 @@ module Sufia::UsersControllerBehavior
            end
     return sort_val
   end
+
+  def deny_access(exception)
+    redirect_to sufia.profile_path(@user.to_param), alert: "Permission denied: cannot access this page."
+  end
 end

data/app/controllers/my/collections_controller.rb

@@ -1,17 +1,10 @@
 module My
   class CollectionsController < MyController
 
-    self.solr_search_params_logic += [
+    self.search_params_logic += [
       :show_only_collections
     ]
 
-    def show_only_collections(solr_parameters, user_parameters)
-      solr_parameters[:fq] ||= []
-      solr_parameters[:fq] += [
-        ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: Collection.to_class_uri)
-      ]
-    end
-
     def index
       super
       @selected_tab = :collections

data/app/controllers/my/files_controller.rb

@@ -1,7 +1,7 @@
 module My
   class FilesController < MyController
 
-    self.solr_search_params_logic += [
+    self.search_params_logic += [
       :show_only_files_deposited_by_current_user,
       :show_only_generic_files
     ]

data/app/controllers/my/highlights_controller.rb

@@ -1,18 +1,10 @@
 module My
   class HighlightsController < MyController
 
-    self.solr_search_params_logic += [
+    self.search_params_logic += [
       :show_only_highlighted_files
     ]
 
-    def show_only_highlighted_files(solr_parameters, user_parameters)
-      ids = current_user.trophies.pluck(:generic_file_id)
-      solr_parameters[:fq] ||= []
-      solr_parameters[:fq] += [
-        ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids)
-      ]
-    end
-
     def index
       super
       @selected_tab = :highlighted

data/app/controllers/my/shares_controller.rb

@@ -1,18 +1,11 @@
 module My
   class SharesController < MyController
 
-    self.solr_search_params_logic += [
+    self.search_params_logic += [
       :show_only_shared_files,
       :show_only_generic_files
     ]
 
-    def show_only_shared_files(solr_parameters, user_parameters)
-      solr_parameters[:fq] ||= []
-      solr_parameters[:fq] += [
-        "-" + ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: current_user.user_key)
-      ]
-    end
-
     def index
       super
       @selected_tab = :shared

data/app/helpers/generic_file_helper.rb

@@ -27,6 +27,10 @@ module GenericFileHelper
     end
   end
 
+  def display_multiple value
+    auto_link(value.join(" | "))
+  end
+
   private
 
   def download_image_tag title = nil

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -23,7 +23,7 @@ module Sufia
       if req.deleted_file?
         req.title
       else
-        link_to(req.title, sufia.generic_file_path(req['pid'].split(':').last))
+        link_to(req.title, sufia.generic_file_path(req.generic_file_id))
       end
     end
 
@@ -162,9 +162,9 @@ module Sufia
       if document.registered?
         content_tag :span, t('sufia.institution_name'), class: "label label-info", title: t('sufia.institution_name')
       elsif document.public?
-        content_tag :span, t('sufia.visibility.open'), class: "label label-success", title: t('sufia.visibility.open')
+        content_tag :span, t('sufia.visibility.open'), class: "label label-success", title: t('sufia.visibility.open_title_attr')
       else
-        content_tag :span, t('sufia.visibility.private'), class: "label label-danger", title: t('sufia.visibility.private')
+        content_tag :span, t('sufia.visibility.private'), class: "label label-danger", title: t('sufia.visibility.private_title_attr')
       end
     end
 

data/app/helpers/sufia_url_helper.rb

@@ -0,0 +1,9 @@
+module SufiaUrlHelper
+  def track_generic_file_path(*args)
+    track_solr_document_path(*args)
+  end
+
+  def track_collection_path(*args)
+    track_solr_document_path(*args)
+  end
+end

data/app/jobs/content_depositor_change_event_job.rb

@@ -4,20 +4,20 @@ class ContentDepositorChangeEventJob < EventJob
     :proxy_deposit
   end
 
-  attr_accessor :pid, :login, :reset
+  attr_accessor :id, :login, :reset
 
-  # @param [String] pid identifier of the file to be transfered
+  # @param [String] id identifier of the file to be transfered
   # @param [String] login the user key of the user the file is being transfered to.
   # @param [Boolean] reset (false) should the access controls be reset. This means revoking edit access from the depositor
-  def initialize(pid, login, reset=false)
-    self.pid = pid
+  def initialize(id, login, reset=false)
+    self.id = id
     self.login = login
     self.reset = reset
   end
 
   def run
     # TODO: This should be in its own job, not this event job
-    file = ::GenericFile.find(pid)
+    file = ::GenericFile.find(id)
     file.proxy_depositor = file.depositor
     file.clear_permissions! if reset
     file.apply_depositor_metadata(login)

data/app/search_builders/sufia/search_builder.rb

@@ -0,0 +1,50 @@
+module Sufia::SearchBuilder
+
+  include BlacklightAdvancedSearch::AdvancedSearchBuilder
+  include Hydra::Collections::SearchBehaviors
+
+  def show_only_collections(solr_parameters)
+    solr_parameters[:fq] ||= []
+    solr_parameters[:fq] += [
+      ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: Collection.to_class_uri)
+    ]
+  end
+
+  def show_only_files_deposited_by_current_user(solr_parameters)
+    solr_parameters[:fq] ||= []
+    solr_parameters[:fq] += [
+      ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: scope.current_user.user_key)
+    ]
+  end
+
+  def show_only_generic_files(solr_parameters)
+    solr_parameters[:fq] ||= []
+    solr_parameters[:fq] += [
+      ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::GenericFile.to_class_uri)
+    ]
+  end
+
+  def show_only_shared_files(solr_parameters)
+    solr_parameters[:fq] ||= []
+    solr_parameters[:fq] += [
+      "-" + ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: scope.current_user.user_key)
+    ]
+  end
+
+  def show_only_highlighted_files(solr_parameters)
+    ids = scope.current_user.trophies.pluck(:generic_file_id)
+    solr_parameters[:fq] ||= []
+    solr_parameters[:fq] += [
+      ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids)
+    ]
+  end
+
+  # Limits search results just to GenericFiles and collections
+  # @param solr_parameters the current solr parameters
+  # @param user_parameters the current user-subitted parameters
+  def only_generic_files_and_collections(solr_parameters)
+    solr_parameters[:fq] ||= []
+    solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:(\"GenericFile\" \"Collection\")"
+  end
+
+end

data/app/views/_user_util_links.html.erb

@@ -1,15 +1,17 @@
 <% if user_signed_in? %>
     <div class="btn-group" id="user_utility_links">
       <%= render partial: 'users/notify_link' %>
-      <%= link_to sufia.dashboard_index_path, class: "btn btn-default", id: "dashboard_link", title: "click for Dashboard" do %>
+      <%= link_to sufia.dashboard_index_path, class: "btn btn-default", id: "dashboard_link" do %>
         <span class="glyphicon glyphicon-dashboard"></span>
-        <span class="sr-only">click for </span>
+        <span class="sr-only">Select to access</span>
         <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
         <span class="sr-only"> dashboard</span>
       <% end %>
-      <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#" title="click for additional menu options"><span class="caret" ></span></a>
+      <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><span class="sr-only">select for additional menu options</span><span class="caret" ></span></a>
       <ul class="dropdown-menu dropdown-menu-right" role="menu">
-        <li><%= link_to raw('<span class="glyphicon glyphicon-upload"></span> upload'), sufia.new_generic_file_path, id: 'upload_nav_link' %></li>
+        <% if can? :create, GenericFile %>
+          <li><%= link_to raw('<span class="glyphicon glyphicon-upload"></span> upload'), sufia.new_generic_file_path, id: 'upload_nav_link' %></li>
+        <% end %>
         <li><%= link_to raw('<span class="glyphicon glyphicon-user"></span> my profile'), sufia.profile_path(current_user), id: 'profile_nav_link' %></li>
         <%= render partial: 'users/user_util_links_extra' %>
         <li class="divider"></li>

data/app/views/batch_edits/_check_all.html.erb

@@ -1,7 +1,7 @@
 <div class="dropdown batch_document_selector_all" >
   <%= check_box_tag 'check_all', 'yes', @all_checked, disabled: @disable_select_all %>
   <% if !@disable_select_all %>
-    <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-cog" title="click for selection options"></span></a>
+    <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="sr-only">Select to access selection options</span><span class="glyphicon glyphicon-cog"></span></a>
     <ul class="dropdown-menu">
       <%= render partial:"#{controller_name}/batch_edits_actions" %>
     </ul>

data/app/views/catalog/index.html.erb

@@ -1,34 +1,7 @@
-<div id="sidebar" class="col-md-3">
+<div id="sidebar" class="col-md-3 col-sm-4">
   <%= render 'search_sidebar' %>
 </div>
 
-<div id="content" class="col-md-9">
-
-
-  <h2 class="sr-only top-content-title"><%= t('blacklight.search.search_results_header') %></h2>
-
-  <% @page_title = t('blacklight.search.title', :application_name => application_name) %>
-
-
-  <% content_for(:head) do -%>
-      <%= render_opensearch_response_metadata %>
-      <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => t('blacklight.search.rss_feed') ) %>
-      <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => t('blacklight.search.atom_feed') ) %>
-  <% end -%>
-
-
-  <%= render 'search_header' %>
-
-  <h2 class="sr-only"><%= t('blacklight.search.search_results') %></h2>
-
-  <%- if @response.empty? %>
-      <%= render "zero_results" %>
-  <%- elsif render_grouped_response? %>
-      <%= render_grouped_document_index %>
-  <%- else %>
-      <%= render_document_index %>
-  <%- end %>
-
-  <%= render 'results_pagination' %>
-
+<div id="content" class="col-md-9 col-sm-8">
+    <%= render 'search_results' %>
 </div>

data/app/views/collections/_media_display.html.erb

@@ -1 +1 @@
-<a href="<%= collections.collection_path %>" target="_new"><span class="glyphicon glyphicon-th collection-icon"></span></a>
+<a href="<%= collections.collection_path %>" target="_new"><%= image_tag "site_images/collection-icon.svg", class: "collection-icon" %></a>

data/app/views/collections/_show_descriptions.html.erb

@@ -1,5 +1,5 @@
 <h2 class="sr-only">Descriptions</h2>
-<dl class="metadata-collections">
+<dl class="dl-horizontal metadata-collections">
   <% present_terms(@presenter, @presenter.terms_with_values - [:title, :description]) do |r, term| %>
       <dt><%= r.label(term) %></dt>
       <dd><%= r.value(term) %></dd>

data/app/views/collections/_show_document_list_row.html.erb

@@ -29,9 +29,9 @@
       <% if document.registered? %>
         <span class="label label-info" title="<%= t('sufia.institution_name') %>"><%= t('sufia.institution_name') %></span>
       <% elsif document.public? %>
-        <span class="label label-success" title="Open Access">Open Access</span>
+        <span class="label label-success" title="<%= t('sufia.visibility.open_title_attr') %>"><%= t('sufia.visibility.open') %></span>
       <% else %>
-        <span class="label label-danger" title="Private">Private</span>
+        <span class="label label-danger" title="<%= t('sufia.visibility.private_title_attr') %>"><%= t('sufia.visibility.private') %></span>
       <% end %>
     </a>
   </td>