sufia 7.0.0.beta2 → 7.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8878efdf23b664d1ccc522e05f997d099dcd43f9
-  data.tar.gz: 8062a829e1bc496ef751aca11363c10bc5fc143c
+  metadata.gz: 425e77caaca484e6386192bbda30de4535f2e3c7
+  data.tar.gz: b0bf0312c34896bfe6d74bec79edaa4291ba20e3
 SHA512:
-  metadata.gz: e1457e174fcfdf5ceb54dc2c9090a37bb03af3c47882f04a046550f19b1687112cfd073ac9b75199ad4db8615ab13790b5ed47ee39772a582b3299dc3070fa82
-  data.tar.gz: afdcc985bc2f96201032af0c9ef78ceb2eb7387499ad0621c775fcfbd0d6a24e315b619fba59cfa2503432d626dcc209cffc754a6498f548091cac415338c9b1
+  metadata.gz: a81ac16b3e74bd6f433903f9b595afabda03f6a1a9dd9674f844fb758ff069428e9e917ee8b46f16b28446cd7550e203390502f1e20d7331f65a57b3637bc1e7
+  data.tar.gz: 0ec61fb29710436341b2d47d6601c610ff4ad02e545f69aa3a913134e0374d97ef9ca9c044d1ae59c66668bde59c385f2ba3f9cbea55b991dc171c0dea4ff8e1

data/app/controllers/concerns/sufia/admin/stats_behavior.rb

@@ -4,6 +4,7 @@ module Sufia
       extend ActiveSupport::Concern
 
       def index
+        authorize! :read, Sufia::Statistics
         stats_filters = params.fetch(:stats_filters, {})
         limit = params.fetch(:limit, "5").to_i
         @presenter = AdminStatsPresenter.new(stats_filters, limit)

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

@@ -13,13 +13,7 @@ module Sufia
     def create
       authenticate_user!
       create_update_job
-      flash[:notice] = <<-EOS.strip_heredoc.tr("\n", ' ')
-        Your files are being processed by #{view_context.application_name} in
-        the background. The metadata and access controls you specified are being applied.
-        Files will be marked <span class="label label-danger" title="Private">Private</span>
-        until this process is complete (shouldn't take too long, hang in there!). You may need
-        to refresh your dashboard to see these updates.
-      EOS
+      flash[:notice] = t('sufia.generic_works.new.after_create_html', application_name: view_context.application_name)
       redirect_after_update
     end
 

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

@@ -45,11 +45,7 @@ module Sufia
     def after_create_response
       respond_to do |wants|
         wants.html do
-          flash[:notice] = "Your files are being processed by #{view_context.application_name} in " \
-            "the background. The metadata and access controls you specified are being applied. " \
-            "Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> " \
-            "until this process is complete (shouldn't take too long, hang in there!). You may need " \
-            "to refresh your dashboard to see these updates."
+          flash[:notice] = t('sufia.generic_works.new.after_create_html', application_name: view_context.application_name)
           redirect_to [main_app, curation_concern]
         end
         wants.json { render :show, status: :created, location: polymorphic_path([main_app, curation_concern]) }

data/app/forms/sufia/forms/collection_form.rb

@@ -1,8 +1,13 @@
 module Sufia::Forms
   class CollectionForm < CurationConcerns::Forms::CollectionEditForm
-    def rendered_terms
-      [:title,
-       :creator,
+    delegate :id, to: :model
+
+    def primary_terms
+      [:title]
+    end
+
+    def secondary_terms
+      [:creator,
        :contributor,
        :description,
        :keyword,

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -159,16 +159,6 @@ module Sufia
               id: "permission_" + document.id, class: "visibility-link"
     end
 
-    def render_visibility_label(document)
-      if document.registered?
-        content_tag :span, institution_name, class: "label label-info", title: institution_name
-      elsif document.public?
-        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_title_attr')
-      end
-    end
-
     def user_display_name_and_key(user_key)
       user = ::User.find_by_user_key(user_key)
       return user_key if user.nil?
@@ -182,6 +172,16 @@ module Sufia
 
     private
 
+      def render_visibility_label(document)
+        if document.registered?
+          content_tag :span, institution_name, class: "label label-info", title: institution_name
+        elsif document.public?
+          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_title_attr')
+        end
+      end
+
       def user_agent
         request.user_agent || ''
       end

data/app/models/concerns/sufia/ability.rb

@@ -3,17 +3,13 @@ module Sufia
     extend ActiveSupport::Concern
 
     included do
-      self.ability_logic += [:sufia_abilities]
-    end
-
-    def sufia_abilities
-      user_abilities
-      featured_work_abilities
-      editor_abilities
-      stats_abilities
-      citation_abilities
-      proxy_deposit_abilities
-      uploaded_file_abilities
+      self.ability_logic += [:user_abilities,
+                             :featured_work_abilities,
+                             :editor_abilities,
+                             :stats_abilities,
+                             :citation_abilities,
+                             :proxy_deposit_abilities,
+                             :uploaded_file_abilities]
     end
 
     def uploaded_file_abilities
@@ -51,6 +47,7 @@ module Sufia
     end
 
     def stats_abilities
+      can :read, Sufia::Statistics if admin?
       alias_action :stats, to: :read
     end
 

data/app/models/concerns/sufia/file_set_behavior.rb

@@ -2,5 +2,10 @@ module Sufia
   module FileSetBehavior
     extend ActiveSupport::Concern
     include Sufia::WithEvents
+
+    # Cast to a SolrDocument by querying from Solr
+    def to_presenter
+      CatalogController.new.fetch(id).last
+    end
   end
 end

data/app/models/featured_work.rb

@@ -10,7 +10,7 @@ class FeaturedWork < ActiveRecord::Base
     errors.add(:base, "Limited to #{FEATURE_LIMIT} featured works.")
   end
 
-  attr_accessor :generic_work_solr_document
+  attr_accessor :presenter
 
   class << self
     def can_create_another?

data/app/models/featured_work_list.rb

@@ -16,8 +16,8 @@ class FeaturedWorkList
     @works = FeaturedWork.all
     add_solr_document_to_works
     @works = @works.reject do |work|
-      work.destroy if work.generic_work_solr_document.blank?
-      work.generic_work_solr_document.blank?
+      work.destroy if work.presenter.blank?
+      work.presenter.blank?
     end
   end
 
@@ -26,8 +26,8 @@ class FeaturedWorkList
   private
 
     def add_solr_document_to_works
-      solr_docs.each do |doc|
-        work_with_id(doc['id']).generic_work_solr_document = SolrDocument.new(doc)
+      work_presenters.each do |presenter|
+        work_with_id(presenter.id).presenter = presenter
       end
     end
 
@@ -35,8 +35,11 @@ class FeaturedWorkList
       @works.pluck(:work_id)
     end
 
-    def solr_docs
-      ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids))
+    def work_presenters
+      ability = nil
+      CurationConcerns::PresenterFactory.build_presenters(ids,
+                                                          Sufia::WorkShowPresenter,
+                                                          ability)
     end
 
     def work_with_id(id)

data/app/search_builders/sufia/homepage_search_builder.rb

@@ -1,4 +1,9 @@
 # Added to allow for the My controller to show only things I have edit access to
 class Sufia::HomepageSearchBuilder < Sufia::SearchBuilder
-  self.default_processor_chain += [:show_only_generic_works, :add_access_controls_to_solr_params]
+  include CurationConcerns::FilterByType
+  self.default_processor_chain += [:add_access_controls_to_solr_params]
+
+  def only_works?
+    true
+  end
 end

data/app/search_builders/sufia/my_collections_search_builder.rb

@@ -1,16 +1,11 @@
 # Added to allow for the My controller to show only things I have edit access to
 class Sufia::MyCollectionsSearchBuilder < Sufia::SearchBuilder
   include Sufia::MySearchBuilderBehavior
+  include CurationConcerns::FilterByType
 
-  self.default_processor_chain += [
-    :show_only_resources_deposited_by_current_user,
-    :show_only_collections
-  ]
+  self.default_processor_chain += [:show_only_resources_deposited_by_current_user]
 
-  def show_only_collections(solr_parameters)
-    solr_parameters[:fq] ||= []
-    solr_parameters[:fq] += [
-      ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: Collection.to_class_uri)
-    ]
+  def only_collections?
+    true
   end
 end

data/app/search_builders/sufia/my_works_search_builder.rb

@@ -1,10 +1,11 @@
 # Added to allow for the My controller to show only things I have edit access to
 class Sufia::MyWorksSearchBuilder < Sufia::SearchBuilder
   include Sufia::MySearchBuilderBehavior
+  include CurationConcerns::FilterByType
 
-  self.default_processor_chain = [:add_advanced_search_to_solr] + default_processor_chain
-  self.default_processor_chain += [
-    :show_only_resources_deposited_by_current_user,
-    :show_only_generic_works
-  ]
+  self.default_processor_chain += [:add_advanced_search_to_solr, :show_only_resources_deposited_by_current_user]
+
+  def only_works?
+    true
+  end
 end

data/app/search_builders/sufia/search_builder.rb

@@ -10,11 +10,4 @@ class Sufia::SearchBuilder < Blacklight::SearchBuilder
       ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: scope.current_user.user_key)
     ]
   end
-
-  def show_only_generic_works(solr_parameters)
-    solr_parameters[:fq] ||= []
-    solr_parameters[:fq] += [
-      ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::GenericWork.to_class_uri)
-    ]
-  end
 end

data/app/views/_toolbar.html.erb

@@ -1,55 +1,39 @@
 <% if user_signed_in? %>
   <ul class="nav navbar-nav">
-    <% if can? :manage, :all %>
-      <li class="dropdown">
-        <%= link_to sufia.admin_stats_path, role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false } do %>
-          <span class="fa fa-gear"></span> Admin <span class="caret"></span>
-        <% end %>
-        <ul class="dropdown-menu">
-          <% if respond_to? :admin_stats_path %>
-            <li><%= link_to 'Repository Statistics', sufia.admin_stats_path %></li>
-          <% end %>
-
-          <% if respond_to? :admin_queues_path %>
-            <li><%= link_to 'Message Queues', sufia.admin_queues_path %></li>
-          <% end %>
-        </ul>
-      </li>
-    <% end %>
-
+    <%= render '/admin/menu' if can? :manage, :all %>
     <li class="dropdown">
       <%= link_to sufia.dashboard_index_path, role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false } do %>
-        <span class="fa fa-tachometer"></span> Dashboard <span class="caret"></span>
+        <span class="fa fa-tachometer"></span> <%= t("sufia.toolbar.dashboard.menu") %> <span class="caret"></span>
       <% end %>
       <ul class="dropdown-menu">
-        <li><%= link_to 'My Dashboard', sufia.dashboard_index_path %></li>
+        <li><%= link_to t("sufia.toolbar.dashboard.my"), sufia.dashboard_index_path %></li>
         <li class="divider"></li>
-        <li><%= link_to 'Transfers', sufia.transfers_path %></li>
+        <li><%= link_to t("sufia.toolbar.dashboard.transfers"), sufia.transfers_path %></li>
         <li class="divider"></li>
-        <li><%= link_to 'Highlights', sufia.dashboard_highlights_path %></li>
-        <li><%= link_to 'Shares', sufia.dashboard_shares_path %></li>
+        <li><%= link_to t("sufia.toolbar.dashboard.highlights"), sufia.dashboard_highlights_path %></li>
+        <li><%= link_to t("sufia.toolbar.dashboard.shares"), sufia.dashboard_shares_path %></li>
       </ul>
     </li>
 
     <% if can_ever_create_works? %>
       <li class="dropdown">
         <%= link_to sufia.dashboard_works_path, role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false } do %>
-          <span class="fa fa-cube"></span> Works <span class="caret"></span>
+          <span class="fa fa-cube"></span> <%= t("sufia.toolbar.works.menu") %> <span class="caret"></span>
         <% end %>
         <ul class="dropdown-menu">
-          <li><%= link_to 'My Works', sufia.dashboard_works_path %></li>
+          <li><%= link_to t("sufia.toolbar.works.my"), sufia.dashboard_works_path %></li>
 
           <% classification = CurationConcerns::QuickClassificationQuery.new(current_user) %>
           <% classification.each do |concern| %>
             <li><%= link_to(
-                  "New #{concern.human_readable_type}",
+                  "#{t("sufia.toolbar.works.new")} #{concern.human_readable_type}",
                   new_polymorphic_path([main_app, concern]),
                   class: "item-option contextual-quick-classify #{dom_class(concern, 'new').gsub('_', '-')}",
                   role: 'menuitem'
                 ) %>
             </li>
           <% end %>
-          <li><%= link_to 'Batch Create', sufia.new_batch_upload_path %></li>
+          <li><%= link_to t("sufia.toolbar.works.batch"), sufia.new_batch_upload_path %></li>
         </ul>
       </li>
     <% end %>
@@ -57,11 +41,11 @@
     <% if can?(:create, Collection) %>
       <li class="dropdown">
         <%= link_to sufia.dashboard_collections_path, role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false } do %>
-          <span class="fa fa-cubes"></span> Collections <span class="caret"></span>
+          <span class="fa fa-cubes"></span> <%= t("sufia.toolbar.collections.menu") %> <span class="caret"></span>
         <% end %>
         <ul class="dropdown-menu">
-          <li><%= link_to 'My Collections', sufia.dashboard_collections_path %></li>
-          <li><%= link_to 'New Collection', main_app.new_collection_path %></li>
+          <li><%= link_to t("sufia.toolbar.collections.my"), sufia.dashboard_collections_path %></li>
+          <li><%= link_to t("sufia.toolbar.collections.new"), main_app.new_collection_path %></li>
         </ul>
       </li>
     <% end %>

data/app/views/admin/_menu.html.erb

@@ -0,0 +1,8 @@
+<li class="dropdown">
+  <%= link_to sufia.admin_stats_path, role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false } do %>
+    <span class="fa fa-gear"></span> <%= t("sufia.toolbar.admin.menu") %> <span class="caret"></span>
+  <% end %>
+  <ul class="dropdown-menu">
+    <li><%= link_to t("sufia.toolbar.admin.statistics"), sufia.admin_stats_path %></li>
+  </ul>
+</li>

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

@@ -3,7 +3,7 @@
 <% @max_batch_size = 100 %>
 <% @user = current_user %>
 <% if documents.empty? %>
-  <div class="alert alert-warning" role="alert"><%= t('sufia.collection.no_visible_works') %></div>
+  <div class="alert alert-warning" role="alert"><%= t('sufia.collection.document_list.no_visible_works') %></div>
 <% else %>
   <% @document_list = documents %>
   <% if params[:action] == "edit" %>

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

@@ -1,5 +1,6 @@
-<h2 class="sr-only">Actions</h2>
+<h2 class="sr-only"><%= t('sufia.collection.actions.header') %></h2>
 <div class="actions-controls-collections">
-  <span class="label label-default"><%= link_to "Browse", collection_path %></span> &nbsp;&nbsp;
-  <span class="label label-default"><%= link_to "Add files",  sufia.dashboard_works_path %></span>
+  <%= link_to t('sufia.collection.actions.add_works.label'),
+              sufia.dashboard_works_path(add_files_to_collection: @form.id),
+              title: t('sufia.collection.actions.add_works.desc') %>
 </div>

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

@@ -1,9 +1,23 @@
 <%= simple_form_for @form, html: { class: 'editor' } do |f| %>
   <div id="descriptions_display">
-    <h2 class="non lower">Descriptions</h2>
-    <% f.object.rendered_terms.each do |term| %>
-      <%= render_edit_field_partial term, f: f %>
-    <% end %>
+    <h2 class="non lower"><%= t('sufia.collection.edit.description') %></h2>
+    <div id="base-terms">
+      <% f.object.primary_terms.each do |term| %>
+        <%= render_edit_field_partial(term, f: f) %>
+      <% end %>
+    </div>
+    <%= link_to t('sufia.collection.edit.additional_fields'),
+            '#extended-terms',
+            class: 'btn btn-default',
+            data: { toggle: 'collapse' },
+            role: "button",
+            'aria-expanded'=> "false",
+            'aria-controls'=> "extended-terms" %>
+    <div id="extended-terms" class='collapse'>
+      <% f.object.secondary_terms.each do |term| %>
+        <%= render_edit_field_partial(term, f: f) %>
+      <% end %>
+    </div>
   </div>
   <%= hidden_field_tag :type, params[:type] %>
   <% if params[:batch_document_ids].present? %>

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

@@ -1 +1,3 @@
-<a href="<%= collection_path %>" target="_new"><span class="fa fa-cubes collection-icon-search"></span></a>
+<%= link_to presenter, target: '_new' do %>
+  <span class="fa fa-cubes collection-icon-search"></span>
+<% end %>

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

@@ -1,7 +1,21 @@
-<h2 class="sr-only">Actions</h2>
+<h2 class="sr-only"><%= t('sufia.collection.actions.header') %></h2>
 <div class="actions-controls-collections">
-  <% if can? :edit, @presenter.solr_document %>
-    <span class="label label-default"><%= link_to "Edit", edit_collection_path, title: "Edit this Collection" %></span> &nbsp;&nbsp;
-    <span class="label label-default"><%= link_to "Add files",  sufia.dashboard_works_path(add_files_to_collection: @presenter.id), title: "Add files to this Collection" %></span>
-  <%end %>
+    <% if can? :edit, presenter.solr_document %>
+      <%= link_to t('sufia.collection.actions.edit.label'),
+                  edit_collection_path(presenter),
+                  title: t('sufia.collection.actions.edit.desc'),
+                  class: 'btn btn-default' %>
+      <%= link_to t('sufia.collection.actions.add_works.label'),
+                  sufia.dashboard_works_path(add_files_to_collection: presenter.id),
+                  title: t('sufia.collection.actions.add_works.desc') %>
+    <%end %>
+
+    <% if can? :destroy, presenter.solr_document %>
+      <%= link_to t('sufia.collection.actions.delete.label'),
+                  collection_path(presenter),
+                  title: t('sufia.collection.actions.delete.desc'),
+                  class: 'btn btn-danger',
+                  data: { confirm: t('sufia.collection.actions.delete.confirmation'),
+                          method: :delete } %>
+    <% end %>
 </div>

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

@@ -3,16 +3,16 @@
   </button>
   <ul class="dropdown-menu dropdown-menu-right">
     <li>
-      <%= link_to edit_curation_concerns_generic_work_path(id),
+      <%= link_to [:edit, document],
                   class: "itemicon itemedit",
-                  title: t('sufia.collection.generic_work.edit'),
-                  id: "edit_work_link_#{id}" do %>
-        <i class='glyphicon glyphicon-pencil'></i> <%= t('sufia.collection.generic_work.edit') %>
+                  title: t('sufia.collection.document_list.edit'),
+                  id: "edit_work_link_#{document.id}" do %>
+        <i class='glyphicon glyphicon-pencil'></i> <%= t('sufia.collection.document_list.edit') %>
       <% end %>
     </li>
     <% if current_user %>
       <li>
-        <%= display_trophy_link(current_user, id) do |text| %>
+        <%= display_trophy_link(current_user, document.id) do |text| %>
           <i class='glyphicon glyphicon-star'></i> <%= text %>
         <% end %>
       </li>