sufia 6.0.0.rc3 → 6.0.0.rc4

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

@@ -0,0 +1,55 @@
+module Sufia
+  module BatchControllerBehavior
+    extend ActiveSupport::Concern
+    include Hydra::Controller::ControllerBehavior
+
+    included do 
+      layout "sufia-one-column"
+
+      before_filter :has_access?
+      ActiveSupport::Deprecation.deprecate_methods(BatchController, :initialize_fields)
+      class_attribute :edit_form_class
+      self.edit_form_class = Sufia::Forms::BatchEditForm 
+    end
+
+    def edit
+      @batch = Batch.find_or_create(params[:id])
+      @form = edit_form
+    end
+
+    def update
+      authenticate_user!
+      @batch = Batch.find_or_create(params[:id])
+      @batch.status = ["processing"]
+      @batch.save
+      file_attributes = edit_form_class.model_attributes(params[:generic_file])
+      Sufia.queue.push(BatchUpdateJob.new(current_user.user_key, params[:id], params[:title], file_attributes, params[:visibility]))
+      flash[:notice] = 'Your files are being processed by ' + t('sufia.product_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.'
+      if uploading_on_behalf_of? @batch
+        redirect_to sufia.dashboard_shares_path
+      else
+        redirect_to sufia.dashboard_files_path
+      end
+    end
+
+    protected
+
+    def edit_form
+      generic_file = ::GenericFile.new(creator: [current_user.name], title: @batch.generic_files.map(&:label))
+      edit_form_class.new(generic_file)
+    end
+
+    # override this method if you need to initialize more complex RDF assertions (b-nodes)
+    def initialize_fields(file)
+      file.initialize_fields
+    end
+
+    def uploading_on_behalf_of? batch
+      file = batch.generic_files.first
+      return false if file.nil? || file.on_behalf_of.blank?
+      current_user.user_key != file.on_behalf_of
+    end
+
+  end
+end
+

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

@@ -40,6 +40,10 @@ module Sufia
       before_filter :build_breadcrumbs, only: [:show, :edit, :stats]
       load_resource only: [:audit]
       load_and_authorize_resource except: [:index, :audit]
+
+      class_attribute :edit_form_class, :presenter_class
+      self.edit_form_class = Sufia::Forms::GenericFileEditForm
+      self.presenter_class = Sufia::GenericFilePresenter
     end
 
     # routed to /files/new
@@ -143,7 +147,7 @@ module Sufia
     end
 
     def presenter
-      Sufia::GenericFilePresenter.new(@generic_file)
+      presenter_class.new(@generic_file)
     end
 
     def version_list
@@ -151,7 +155,7 @@ module Sufia
     end
 
     def edit_form
-      Sufia::Forms::GenericFileEditForm.new(@generic_file)
+      edit_form_class.new(@generic_file)
     end
 
     def audit_service
@@ -188,7 +192,7 @@ module Sufia
 
     # this is provided so that implementing application can override this behavior and map params to different attributes
     def update_metadata
-      file_attributes = Sufia::Forms::GenericFileEditForm.model_attributes(params[:generic_file])
+      file_attributes = edit_form_class.model_attributes(params[:generic_file])
       actor.update_metadata(file_attributes, params[:visibility])
     end
 

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

@@ -0,0 +1,51 @@
+module Sufia
+  module SingleUseLinksControllerBehavior
+    extend ActiveSupport::Concern
+    included do
+
+      before_filter :authenticate_user!
+      before_filter :authorize_user!
+      # Catch permission errors
+      rescue_from Hydra::AccessDenied, CanCan::AccessDenied do |exception|
+        if current_user and current_user.persisted?
+          redirect_to root_url, alert: "You do not have sufficient privileges to create links to this document"
+        else
+          session["user_return_to"] = request.url
+          redirect_to new_user_session_url, alert: exception.message
+        end
+      end
+
+    end
+
+    def new_download
+      @su = SingleUseLink.create itemId: params[:id], path: sufia.download_path(id: asset)
+      @link = sufia.download_single_use_link_path(@su.downloadKey)
+
+      respond_to do |format|
+        format.html
+        format.js  { render js: @link }
+      end
+    end
+
+    def new_show
+      @su = SingleUseLink.create itemId: params[:id], path: sufia.polymorphic_path(asset)
+      @link = sufia.show_single_use_link_path(@su.downloadKey)
+
+      respond_to do |format|
+        format.html
+        format.js  { render js: @link }
+      end
+    end
+
+
+    protected
+    def authorize_user!
+      authorize! :edit, asset
+    end
+
+    def asset
+      @asset ||= ActiveFedora::Base.load_instance_from_solr(params[:id])
+    end
+
+  end
+end

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

@@ -0,0 +1,58 @@
+require 'sufia/single_use_error'
+
+module Sufia
+  module SingleUseLinksViewerControllerBehavior
+    extend ActiveSupport::Concern
+    include Sufia::DownloadsControllerBehavior
+    included do
+      skip_before_filter :load_file, except: :download
+      rescue_from Sufia::SingleUseError, with: :render_single_use_error
+      rescue_from CanCan::AccessDenied, with: :render_single_use_error
+      rescue_from ActiveRecord::RecordNotFound, with: :render_single_use_error
+      class_attribute :presenter_class
+      self.presenter_class = Sufia::GenericFilePresenter
+    end
+
+    def download
+      raise not_found_exception unless single_use_link.path == sufia.download_path(id: @asset)
+      send_content
+    end
+
+    def show
+      raise not_found_exception unless single_use_link.path == sufia.polymorphic_path(@asset)
+
+      #show the file
+      @presenter = presenter
+
+      # create a dowload link that is single use for the user since we do not just want to show metadata we want to access it too
+      @su = single_use_link.create_for_path sufia.download_path(id: @asset)
+      @download_link = sufia.download_single_use_link_path(@su.downloadKey)
+    end
+
+    protected
+
+    def presenter
+      presenter_class.new(@asset)
+    end
+
+    def authorize_download!
+      authorize! :read, asset
+    end
+
+    def single_use_link
+      @single_use_link ||= SingleUseLink.find_by_downloadKey!(params[:id])
+    end
+
+    def not_found_exception
+      Sufia::SingleUseError.new('Single-Use Link Not Found')
+    end
+
+    def asset
+      @asset ||= ActiveFedora::Base.find(single_use_link.itemId)
+    end
+
+    def current_ability
+      @current_ability ||= SingleUseLinksViewerController::Ability.new current_user, single_use_link
+    end
+  end
+end 

data/app/controllers/content_blocks_controller.rb

@@ -1,5 +1,10 @@
 class ContentBlocksController < ApplicationController
-  load_and_authorize_resource
+  load_and_authorize_resource except: :index
+  before_filter :load_featured_researchers, only: :index
+  authorize_resource only: :index
+
+  def index
+  end
 
   def create
     @content_block.save
@@ -21,4 +26,8 @@ protected
     params.require(:content_block).permit([:value, :external_key])
   end
 
+  def load_featured_researchers
+    @content_blocks = ContentBlock.recent_researchers.page(params[:page])
+  end
+
 end

data/app/controllers/single_use_links_controller.rb

@@ -1,43 +1,4 @@
 class SingleUseLinksController < ApplicationController
-  before_filter :authenticate_user!
-  before_filter :authorize_user!
-
-  def new_download
-    @su = SingleUseLink.create itemId: params[:id], path: sufia.download_path(id: asset)
-    @link = sufia.download_single_use_link_path(@su.downloadKey)
-
-    respond_to do |format|
-      format.html
-      format.js  { render js: @link }
-    end
-  end
-
-  def new_show
-    @su = SingleUseLink.create itemId: params[:id], path: sufia.polymorphic_path(asset)
-    @link = sufia.show_single_use_link_path(@su.downloadKey)
-
-    respond_to do |format|
-      format.html
-      format.js  { render js: @link }
-    end
-  end
-
-  # Catch permission errors
-  rescue_from Hydra::AccessDenied, CanCan::AccessDenied do |exception|
-    if current_user and current_user.persisted?
-      redirect_to root_url, alert: "You do not have sufficient privileges to create links to this document"
-    else
-      session["user_return_to"] = request.url
-      redirect_to new_user_session_url, alert: exception.message
-    end
-  end
-
-  protected
-  def authorize_user!
-    authorize! :edit, asset
-  end
-
-  def asset
-    @asset ||= ActiveFedora::Base.load_instance_from_solr(params[:id])
-  end
+  include Sufia::SingleUseLinksControllerBehavior
 end
+

data/app/controllers/single_use_links_viewer_controller.rb

@@ -1,9 +1,5 @@
-require 'sufia/single_use_error'
-
 class SingleUseLinksViewerController < ApplicationController
-  include Sufia::DownloadsControllerBehavior
-
-  skip_before_filter :load_file, except: :download
+  include Sufia::SingleUseLinksViewerControllerBehavior
 
   class Ability
     include CanCan::Ability
@@ -21,49 +17,4 @@ class SingleUseLinksViewerController < ApplicationController
     end
   end
 
-  rescue_from Sufia::SingleUseError, with: :render_single_use_error
-  rescue_from CanCan::AccessDenied, with: :render_single_use_error
-  rescue_from ActiveRecord::RecordNotFound, with: :render_single_use_error
-
-  def download
-    raise not_found_exception unless single_use_link.path == sufia.download_path(id: @asset)
-    send_content
-  end
-
-  def show
-    raise not_found_exception unless single_use_link.path == sufia.polymorphic_path(@asset)
-
-    #show the file
-    @presenter = presenter
-
-    # create a dowload link that is single use for the user since we do not just want to show metadata we want to access it too
-    @su = single_use_link.create_for_path sufia.download_path(id: @asset)
-    @download_link = sufia.download_single_use_link_path(@su.downloadKey)
-  end
-
-  protected
-
-  def presenter
-    Sufia::GenericFilePresenter.new(@asset)
-  end
-
-  def authorize_download!
-    authorize! :read, asset
-  end
-
-  def single_use_link
-    @single_use_link ||= SingleUseLink.find_by_downloadKey!(params[:id])
-  end
-
-  def not_found_exception
-    Sufia::SingleUseError.new('Single-Use Link Not Found')
-  end
-
-  def asset
-    @asset ||= ActiveFedora::Base.find(single_use_link.itemId)
-  end
-
-  def current_ability
-    @current_ability ||= SingleUseLinksViewerController::Ability.new current_user, single_use_link
-  end
 end

data/app/helpers/content_block_helper.rb

@@ -27,11 +27,15 @@ module ContentBlockHelper
       concat hidden_field_tag 'content_block[name]', content_block.name
       concat f.text_area :value, id: editing_field_id, class: "tinymce", rows: 20, cols: 120
       concat f.label :external_key, content_block.external_key_name
-      concat f.text_field :external_key
+      concat f.text_field :external_key, class: key_field_class(content_block.name)
       concat content_tag(:div) { f.submit 'Save', class: "btn btn-primary" }
     }
   end
 
+  def key_field_class(content_block_type)
+    content_block_type == ContentBlock::RESEARCHER ? 'select2-user' : ''
+  end
+
   def new_form(name)
     content_block = ContentBlock.new(name: name)
     edit_form(content_block, "new_#{name}_text_area")

data/app/views/batch/edit.html.erb

@@ -16,7 +16,7 @@
 
   <%= render 'generic_files/permission_form', f: f, batch: @batch %>
 
-  <div class="row" id="permissions_submit">
+  <div id="permissions_submit">
     <%= button_tag type: 'submit', class: 'btn btn-primary btn-lg',
         onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" do %>
       <i class="glyphicon glyphicon-floppy-disk"></i> Save

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

@@ -1,5 +1,5 @@
-<%= form_tag(batch_edits_path, method: :delete, class: "batch-select-all hidden", "data-behavior" => 'batch-select-all') do -%>
+<%= form_tag(batch_edits_path, method: :delete, class: "batch-select-all hidden button_to-inline", "data-behavior" => 'batch-select-all') do -%>
     <%= hidden_field_tag('update_type', 'delete_all') %>
     <%= hidden_field_tag('return_controller', params[:controller]) %>
-  <%= submit_tag("Delete Selected", class: 'batch-all-button btn btn-primary submits-batches', data: { confirm: "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation" }) %>
+  <%= submit_tag("Delete Selected", class: 'batch-all-button btn btn-danger submits-batches', data: { confirm: "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation" }) %>
 <% end %>

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

@@ -21,7 +21,7 @@
             <% end %>
             <%= render_hash_as_hidden_fields(params_for_search.except(:per_page, :sort)) %>
             &nbsp;&nbsp;&nbsp;
-            <button class="btn btn-primary"><i class="glyphicon glyphicon-refresh"></i> Refresh</button>
+            <button class="btn btn-info"><i class="glyphicon glyphicon-refresh"></i> Refresh</button>
             <%= render 'view_type_group' %>
          <% end %>
       <% end unless sort_fields.empty? %>

data/app/views/content_blocks/_featured_researcher.html.erb

@@ -0,0 +1,3 @@
+<div class='featured-researcher'>
+  <%= raw(featured_researcher_block.value) %>
+</div>

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

@@ -0,0 +1,7 @@
+<h1> Featured Researchers </h1>
+
+<div class="col-xs-12 col-sm-6">
+  <%= render partial: 'featured_researcher', collection: @content_blocks, as: :featured_researcher_block %>
+
+  <%= paginate @content_blocks, outer_window: 2, theme: 'blacklight', route_set: sufia %>
+</div>

data/app/views/dashboard/_index_partials/_user_info.html.erb

@@ -9,10 +9,10 @@
     </div>
 
     <div class="col-xs-6 col-sm-12 col-md-6 user-info">
-      <%= link_to t("sufia.view_profile"), sufia.profile_path(@user), class: "btn btn-default btn-raised" %>
+      <%= link_to t("sufia.view_profile"), sufia.profile_path(@user), class: "btn btn-default" %>
     </div>
     <div class="col-xs-6 col-sm-12 col-md-6 user-info">
-      <%= link_to t("sufia.edit_profile"), sufia.edit_profile_path(@user), class: "btn btn-default btn-raised" %>
+      <%= link_to t("sufia.edit_profile"), sufia.edit_profile_path(@user), class: "btn btn-default" %>
     </div>
   </div>
 </div>

data/app/views/generic_files/_permission.html.erb

@@ -2,7 +2,7 @@
     <%= form_for generic_file, url: sufia.generic_file_path(generic_file), html: {multipart: true, class: 'form-horizontal', id: 'permission'} do |f| %>
       <%= hidden_field_tag('redirect_tab', 'permissions') %>
       <%= render "generic_files/permission_form", f: f %>
-      <div class="row" id="permissions_submit">
+      <div id="permissions_submit">
         <%= button_tag type: 'submit', class: 'btn btn-primary btn-lg', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" do %>
           <i class="glyphicon glyphicon-floppy-disk"></i> Save
         <% end %>

data/app/views/generic_files/show.html.erb

@@ -47,7 +47,7 @@
     <%= render 'show_collections' %>
   </div>
   <div itemscope itemtype="<%= @presenter.itemtype %>" class="col-xs-12 col-sm-8">
-    <h1 class="visibility"><%= @presenter %> <%= render_visibility_badge %></h1>
+    <h1 class="visibility"><%= @presenter.title.first %> <%= render_visibility_badge %></h1>
     <%= render 'show_descriptions' %>
     <%= render 'show_details' %>
     <%= render 'users/activity_log', events: @events %>

data/app/views/generic_files/upload/_form_fields.html.erb

@@ -8,21 +8,21 @@
         <div class="row fileupload-buttonbar">
             <div class="col-md-7">
                 <!-- The fileinput-button span is used to style the file input field as button -->
-                <span class="btn btn-success fileinput-button">
+                <span class="btn btn-primary fileinput-button">
                     <i class="glyphicon glyphicon-plus" aria-hidden="true"></i>
                     <span aria-hidden="true">Select files...</span>
                     <input type="file" name="files[]" multiple />
                 </span>
                 <% ua = request.env['HTTP_USER_AGENT'] %>
                 <% if !!(ua =~ /Chrome/) %>
-                <span class="btn btn-success fileinput-button">
+                <span class="btn btn-primary fileinput-button">
                     <i class="glyphicon glyphicon-plus"  aria-hidden="true"></i>
                     <span aria-hidden="true">Select folder...</span>
                     <input type="file" name="files[]" directory webkitdirectory mozdirectory />
                 </span>
                 <% end %>
                 <div id="main_upload_start_span" class="activate-container visible-all-inline-block" data-toggle="tooltip" data-title="<%= t('sufia.upload_tooltip') %>">
-                  <button type="submit" class="activate-submit btn btn-primary start" id="main_upload_start">
+                  <button type="submit" class="activate-submit btn btn-info start" id="main_upload_start">
                     <i class="glyphicon glyphicon-upload"></i>
                     <span>Start upload</span>
                 </button>