sufia 4.0.1 → 4.1.0

data/README.md

@@ -32,7 +32,7 @@ Sufia has the following features:
 * Full-text indexing & searching
 * Responsive, fluid, Bootstrap 3-based UI
 * Dynamically configurable featured works and researchers on homepage
-* Proxy deposit and transfers of ownership (coming soon!)
+* Proxy deposit and transfers of ownership
 
 ## License
 
@@ -119,8 +119,8 @@ Turbolinks does not mix well with Blacklight.
 
 #### Kaminari
 
-The line with kaminari listed as a dependency in Gemfile is a temporary fix to address a 
-[problem](https://github.com/amatsuda/kaminari/pull/322) in the current release of kaminari. 
+The line with kaminari listed as a dependency in Gemfile is a temporary fix to address a
+[problem](https://github.com/amatsuda/kaminari/pull/322) in the current release of kaminari.
 Technically you should not have to list kaminari, which is a dependency of blacklight and sufia.
 
 #### Bundler
@@ -139,6 +139,10 @@ Bundler could not find compatible versions for gem "bootstrap-sass":
 
 The solution is to update your bundler gem to the latest version.
 
+### Proxies and Transfers
+
+To add proxies and transfers to your Sufia 4-based app, run the 'sufia:models:proxies' generator and then run 'rake db:migrate'.
+
 ### Analytics
 
 Sufia provides support for capturing usage information via Google Analytics and for displaying usage stats in the UI.

data/SUFIA_VERSION

@@ -1 +1 @@
-4.0.1
+4.1.0

data/app/assets/javascripts/sufia.js

@@ -19,6 +19,7 @@
 //= require jquery.validate
 //= require swfobject
 //= require ZeroClipboard.min
+//= require select2
 
 //= require flot/excanvas
 //= require flot/jquery.flot
@@ -42,9 +43,13 @@
 //= require sufia/editor
 //= require sufia/ga_events
 //= require sufia/tabs
+//= require sufia/user_search
+//= require sufia/transfers
+//= require sufia/proxy_rights
 //= require hydra/batch_select
 //= require sufia/dashboard_actions
 //= require sufia/batch
+
 //= require hydra_collections
 //= require browse_everything
 //= require jquery.blacklightTagCloud
@@ -98,10 +103,8 @@ Blacklight.onLoad(function() {
     });
   };
 
-
   $("a[rel=popover]").click(function() { return false;});
 
-
   /*
    * facets lists
    */

data/app/assets/javascripts/sufia/proxy_rights.js

@@ -0,0 +1,68 @@
+(function( $ ){
+
+  $.fn.proxyRights = function( options ) {
+
+    // Create some defaults, extending them with any options that were provided
+    var settings = $.extend( { }, options);
+
+    var $container = this;
+
+    function addContributor(name, id, grantor) {
+      data = {name: name, id: id}
+
+      $.ajax({
+        type: "POST",
+        url: '/users/'+grantor+'/depositors',
+        dataType: 'json',
+        data: {grantee_id: id},
+        success: function (data) {
+          if (data.name !== undefined) {
+            row = rowTemplate(data);
+            $('#authorizedProxies tbody', $container).append(row);
+            if (settings.afterAdd)
+              settings.afterAdd(this, cloneElem);
+          }
+        }
+      })
+      return false;
+    }
+
+    function removeContributor(event) {
+      event.preventDefault();
+      $.ajax({
+        url: $(this).closest('a').prop('href'),
+        type: "post",
+        dataType: "json",
+        data: {"_method":"delete"}
+      });
+      $(this).closest('tr').remove();
+      return false;
+    }
+
+    function rowTemplate (data) {
+      return '<tr>'+
+                '<td class="depositor-name">'+data.name+'</td>'+
+                '<td><a class="remove-proxy-button" data-method="delete" href="'+data.delete_path+'" rel="nofollow">'+
+                  '<i class="glyphicon glyphicon-remove"></i></a>'+
+                '</td>'+
+              '</tr>'
+    }
+
+    $("#user").userSearch();
+    $("#user").on("change", function() {
+      // Remove the choice from the select2 widget and put it in the table.
+      obj = $("#user").select2("data")
+      grantor = $('#user').data('grantor')
+      $("#user").select2("val", '')
+      addContributor(obj.text, obj.id, grantor);
+    });
+
+    $('body').on('click', 'a.remove-proxy-button', removeContributor);
+
+  };
+
+})( jQuery );
+
+Blacklight.onLoad(function() {
+  $('.proxy-rights').proxyRights();
+});

data/app/assets/javascripts/sufia/transfers.js

@@ -0,0 +1,3 @@
+$(document).ready(function() {
+  $("#proxy_deposit_request_transfer_to").userSearch();
+});

data/app/assets/javascripts/sufia/user_search.js

@@ -0,0 +1,31 @@
+(function( $ ){
+
+  $.fn.userSearch = function( options ) {
+    // Create some defaults, extending them with any options that were provided
+    var settings = $.extend( { }, options);
+
+    var $container = this;
+
+    return this.each(function() {
+      $(this).select2( {
+        placeholder: "Search for a user",
+        minimumInputLength: 2,
+        initSelection: function(element, callback) { },
+        ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
+          url: "/users.json",
+          dataType: 'json',
+          data: function (term, page) {
+            return {
+              uq: term // search term
+            };
+          },
+          results: function (data, page) { // parse the results into the format expected by Select2.
+            // since we are using custom formatting functions we do not need to alter remote JSON data
+            return {results: data};
+          }
+        },
+      }).select2('data', null);
+    });
+
+  };
+})( jQuery );

data/app/assets/stylesheets/jquery-ui.css

@@ -243,25 +243,25 @@ body .ui-tooltip { border-width: 2px; }
 .ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
+.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
 .ui-widget-content a { color: #222222/*{fcContent}*/; }
-.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; }
+.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; }
 .ui-widget-header a { color: #222222/*{fcHeader}*/; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; }
 .ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121/*{fcHover}*/; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; text-decoration: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636/*{fcHighlight}*/; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a/*{fcError}*/; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a/*{fcError}*/; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -273,14 +273,14 @@ body .ui-tooltip { border-width: 2px; }
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; }
+.ui-icon { width: 16px; height: 16px; background-image: url(ui-icons_222222_256x240.png)/*{iconsContent}*/; }
+.ui-widget-content .ui-icon {background-image: url(ui-icons_222222_256x240.png)/*{iconsContent}*/; }
+.ui-widget-header .ui-icon {background-image: url(ui-icons_222222_256x240.png)/*{iconsHeader}*/; }
+.ui-state-default .ui-icon { background-image: url(ui-icons_888888_256x240.png)/*{iconsDefault}*/; }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(ui-icons_454545_256x240.png)/*{iconsHover}*/; }
+.ui-state-active .ui-icon {background-image: url(ui-icons_454545_256x240.png)/*{iconsActive}*/; }
+.ui-state-highlight .ui-icon {background-image: url(ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; }
 
 /* positioning */
 .ui-icon-carat-1-n { background-position: 0 0; }
@@ -470,5 +470,5 @@ body .ui-tooltip { border-width: 2px; }
 .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; }
 
 /* Overlays */
-.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; }
-.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -khtml-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; }
+.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; }
+.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -khtml-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; }

data/app/assets/stylesheets/sufia.css.scss

@@ -3,6 +3,7 @@
  *= require generic_files
  *= require video-js
  *= require jquery-ui
+ *= require select2
  *= require sufia-audio-overrides
  *= require nestable
 */
@@ -14,7 +15,7 @@
 // Use import here instead of require so we can use the Sass variables defined in Bootstrap and Blacklight
 // TODO: Probably should use import throughout and move all of Sufia's stylesheets into a single named directory.
 @import 'sufia/settings','sufia/header','sufia/styles','sufia/file-listing','sufia/collections','sufia/batch-edit',
-'sufia/dashboard','sufia/home-page','sufia/featured','sufia/tagcloud','sufia/usage-stats','sufia/catalog','sufia/buttons';
+'sufia/dashboard','sufia/home-page','sufia/featured','sufia/tagcloud','sufia/usage-stats','sufia/catalog','sufia/buttons','sufia/proxy-rights';
 
 #browse-everything {
   top:10%;
@@ -48,4 +49,4 @@
 
 .button_to-inline {
   display: inline-block;
-}
+}

data/app/assets/stylesheets/sufia/_proxy-rights.scss

@@ -0,0 +1,10 @@
+table#authorizedProxies {
+  a.remove-proxy-button {
+    i {
+      color: darken(red, 30%);
+    }
+    &:hover i {
+      color: red;
+    }
+  }
+}

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

@@ -1,31 +1,30 @@
 module Sufia
   module ContactFormControllerBehavior
+    def new
+      @contact_form = ContactForm.new
+    end
 
-  def new
-    @contact_form = ContactForm.new
-  end
-
-  def create
-    @contact_form = ContactForm.new(params[:contact_form])
-    @contact_form.request = request
-    # not spam and a valid form
-    logger.warn "*** MARK ***"
-    if @contact_form.deliver
-      flash.now[:notice] = 'Thank you for your message!'
-      after_deliver
-      render :new
-    else
-      flash[:error] = 'Sorry, this message was not sent successfully. ' 
-      flash[:error] << @contact_form.errors.full_messages.map { |s| s.to_s }.join(",")
+    def create
+      @contact_form = ContactForm.new(params[:contact_form])
+      @contact_form.request = request
+      # not spam and a valid form
+      logger.warn "*** MARK ***"
+      if @contact_form.deliver
+        flash.now[:notice] = 'Thank you for your message!'
+        after_deliver
+        render :new
+      else
+        flash.now[:error] = 'Sorry, this message was not sent successfully. '
+        flash.now[:error] << @contact_form.errors.full_messages.map(&:to_s).join(",")
+        render :new
+      end
+    rescue
+      flash.now[:error] = 'Sorry, this message was not delivered.'
       render :new
     end
-  rescue 
-      flash[:error] = 'Sorry, this message was not delivered.'
-      render :new
-  end
 
-  def after_deliver
-     return unless Sufia::Engine.config.enable_contact_form_delivery
-  end
+    def after_deliver
+      return unless Sufia::Engine.config.enable_contact_form_delivery
+    end
   end
 end

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

@@ -0,0 +1,41 @@
+module Sufia
+  module DepositorsControllerBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      before_filter :authenticate_user!
+      before_filter :validate_users, only: :create
+    end
+
+    def create
+      grantor = authorize_and_return_grantor
+      grantee = ::User.from_url_component(params[:grantee_id])
+      if grantor.can_receive_deposits_from.include?(grantee)
+        head :ok
+      else
+        grantor.can_receive_deposits_from << grantee
+        render json: { name: grantee.name, delete_path: sufia.user_depositor_path(grantor.user_key, grantee.user_key) }
+      end
+    end
+
+    def destroy
+      grantor = authorize_and_return_grantor
+      grantor.can_receive_deposits_from.delete(::User.from_url_component(params[:id]))
+      head :ok
+    end
+
+    def validate_users
+      if params[:user_id] == params[:grantee_id]
+        head :ok
+      end
+    end
+
+    private
+
+    def authorize_and_return_grantor
+      grantor = ::User.from_url_component(params[:user_id])
+      authorize! :edit, grantor
+      return grantor
+    end
+  end
+end

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

@@ -211,6 +211,7 @@ module Sufia
     def update_metadata_from_upload_screen
       # Relative path is set by the jquery uploader when uploading a directory
       @generic_file.relative_path = params[:relative_path] if params[:relative_path]
+      @generic_file.on_behalf_of = params[:on_behalf_of] if params[:on_behalf_of]
     end
   end
 end

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

@@ -0,0 +1,76 @@
+module Sufia
+  module TransfersControllerBehavior
+    extend ActiveSupport::Concern
+
+    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]
+      # Catch permission errors
+      # TODO we should make this a module in Sufia
+      rescue_from CanCan::AccessDenied do |exception|
+        if current_user and current_user.persisted?
+          redirect_to root_url, alert: exception.message
+        else
+          session["user_return_to"] = request.url
+          redirect_to new_user_session_url, alert: exception.message
+        end
+      end
+    end
+
+    def new
+      @generic_file = ::GenericFile.load_instance_from_solr(@pid)
+    end
+
+    def create
+      @proxy_deposit_request.sending_user = current_user
+      if @proxy_deposit_request.save
+        redirect_to sufia.transfers_path, notice: "Transfer request created"
+      else
+        redirect_to root_url, alert: @proxy_deposit_request.errors.full_messages.to_sentence
+      end
+    end
+
+    def index
+      @incoming = ProxyDepositRequest.where(receiving_user_id: current_user.id).reject &:deleted_file?
+      @outgoing = ProxyDepositRequest.where(sending_user_id: current_user.id)
+    end
+
+    def accept
+      @proxy_deposit_request.transfer!(params[:reset])
+      if params[:sticky]
+        current_user.can_receive_deposits_from << @proxy_deposit_request.sending_user
+      end
+      redirect_to sufia.transfers_path, notice: "Transfer complete"
+    end
+
+    def reject
+      @proxy_deposit_request.reject!
+      redirect_to sufia.transfers_path, notice: "Transfer rejected"
+    end
+
+    def destroy
+      @proxy_deposit_request.cancel!
+      redirect_to sufia.transfers_path, notice: "Transfer canceled"
+    end
+
+    private
+
+    def get_pid_and_authorize_depositor
+      @pid = Sufia::Noid.namespaceize(params[:id])
+      authorize! :edit, @pid
+      raise Hydra::AccessDenied unless ::GenericFile.load_instance_from_solr(@pid).depositor == current_user.user_key
+      @proxy_deposit_request.pid = @pid
+    rescue
+      redirect_to root_url, alert: 'You are not authorized to transfer this file'
+    end
+
+    def load_proxy_deposit_request
+      @proxy_deposit_request = ProxyDepositRequest.new(proxy_deposit_request_params)
+    end
+
+    def proxy_deposit_request_params
+      params.require(:proxy_deposit_request).permit(:transfer_to)
+    end
+  end
+end