sufia 4.0.1 → 4.1.0

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

@@ -24,14 +24,14 @@ module Sufia::UsersControllerBehavior
       format.html
       format.json { render json: @users.to_json }
     end
-    
+
   end
 
   # Display user profile
   def show
     if @user.respond_to? :profile_events
-      @events = @user.profile_events(100) 
-    else 
+      @events = @user.profile_events(100)
+    else
       @events = []
     end
     @trophies = @user.trophy_files
@@ -65,7 +65,7 @@ module Sufia::UsersControllerBehavior
     redirect_to sufia.profile_path(@user.to_param), notice: "Your profile has been updated"
   end
 
-  def toggle_trophy    
+  def toggle_trophy
      id = Sufia::Noid.namespaceize params[:file_id]
      unless current_user.can? :edit, id
        redirect_to root_path, alert: "You do not have permissions to the file"
@@ -73,17 +73,16 @@ module Sufia::UsersControllerBehavior
      end
      # TODO  make sure current user has access to file
      t = current_user.trophies.where(generic_file_id: params[:file_id]).first
-     if t 
-       t.destroy  
+     if t
+       t.destroy
        #TODO do this better says Mike
-       return false if t.persisted?  
+       return false if t.persisted?
      else
        t = current_user.trophies.create(generic_file_id: params[:file_id])
        return false unless t.persisted?
      end
      render json: t
-  end 
-
+  end
 
   # Follow a user
   def follow
@@ -105,7 +104,7 @@ module Sufia::UsersControllerBehavior
 
   protected
 
-  # You can override base_query to return a list of arguments 
+  # You can override base_query to return a list of arguments
   def base_query
     [nil]
   end
@@ -133,4 +132,3 @@ module Sufia::UsersControllerBehavior
     return sort_val
   end
 end
-

data/app/controllers/depositors_controller.rb

@@ -0,0 +1,3 @@
+class DepositorsController < ApplicationController
+  include Sufia::DepositorsControllerBehavior
+end

data/app/controllers/transfers_controller.rb

@@ -0,0 +1,3 @@
+class TransfersController < ApplicationController
+  include Sufia::TransfersControllerBehavior
+end

data/app/helpers/sufia/dashboard_helper_behavior.rb

@@ -1,5 +1,20 @@
 module Sufia
   module DashboardHelperBehavior
+    def render_sent_transfers
+      if @outgoing.present?
+        render partial: 'transfers/sent'
+      else
+        t('sufia.dashboard.no_transfers')
+      end
+    end
+
+    def render_received_transfers
+      if @incoming.present?
+        render partial: 'transfers/received'
+      else
+        t('sufia.dashboard.no_transfer_requests')
+      end
+    end
 
     def render_recent_activity
       if @activity.empty?

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -1,5 +1,27 @@
 module Sufia
   module SufiaHelperBehavior
+    def error_messages_for(object)
+      if object.try(:errors) and object.errors.full_messages.any?
+        content_tag(:div, class: 'alert alert-block alert-error validation-errors') do
+          content_tag(:h4, I18n.t('sufia.errors.header', model: object.class.model_name.human.downcase), class: 'alert-heading') +
+            content_tag(:ul) do
+            object.errors.full_messages.map do |message|
+              content_tag(:li, message)
+            end.join('').html_safe
+          end
+        end
+      else
+        '' # return empty string
+      end
+    end
+
+    def show_transfer_request_title(req)
+      if req.deleted_file?
+        req.title
+      else
+        link_to(req.title, sufia.generic_file_path(req['pid'].split(':').last))
+      end
+    end
 
     # You can configure blacklight to use this as the thumbnail
     # example:
@@ -122,7 +144,7 @@ module Sufia
     def search_form_action
       if on_the_dashboard?
         search_action_for_dashboard
-      else  
+      else
         catalog_index_path
       end
     end
@@ -156,7 +178,7 @@ module Sufia
         sufia.dashboard_highlights_path
       else
         sufia.dashboard_files_path
-      end    
+      end
     end
 
   end

data/app/jobs/content_depositor_change_event_job.rb

@@ -0,0 +1,50 @@
+class ContentDepositorChangeEventJob < EventJob
+
+  def queue_name
+    :proxy_deposit
+  end
+
+  attr_accessor :pid, :login, :reset
+
+  # @param [String] pid 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
+    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.proxy_depositor = file.depositor
+    file.rightsMetadata.clear_permissions! if reset
+    file.apply_depositor_metadata(login)
+    file.save!
+
+    action = "User #{link_to_profile file.proxy_depositor} has transferred #{link_to file.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(file.noid)} to User #{link_to_profile login}"
+    timestamp = Time.now.to_i
+    depositor = ::User.find_by_user_key(file.depositor)
+    proxy_depositor = ::User.find_by_user_key(file.proxy_depositor)
+    # Create the event
+    event = proxy_depositor.create_event(action, timestamp)
+    # Log the event to the GF's stream
+    file.log_event(event)
+
+    #log the event to the depositor
+    log_depositor_event(event, depositor, file)
+
+    #log the event to the proxy_depositor
+    log_depositor_event(event, proxy_depositor, file)
+  end
+
+  def log_depositor_event(event, depositor, gf)
+    # Log the event to the depositor's profile stream
+    depositor.log_profile_event(event)
+    # Fan out the event to all followers who have access
+    depositor.followers.select { |user| user.can? :read, gf }.each do |follower|
+      follower.log_event(event)
+    end
+  end
+end

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

@@ -16,3 +16,21 @@
     <%= link_to_additional_notifications %>
   </div>
 </div>
+
+<div class="panel panel-default" id="proxy_management">
+  <div class="panel-heading dashboard-panel">
+    <h3 class="panel-title ">Manage Proxies</h3>
+  </div>
+  <div class="panel-body">
+    <%= render partial: 'dashboard/_index_partials/proxy_rights' %>
+  </div>
+</div>
+
+<div class="panel panel-default" id="transfers">
+  <div class="panel-heading dashboard-panel">
+    <h3 class="panel-title "><%= t("sufia.dashboard.transfer_of_ownership") %></h3>
+  </div>
+  <div class="panel-body">
+    <%= render partial: 'dashboard/_index_partials/transfers' %>
+  </div>
+</div>

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

@@ -0,0 +1,23 @@
+<div class="clearfix proxy-rights">
+
+  <div class="col-xs-6 proxy-search">
+    <h3 class="panel-title">Authorize Proxy</h3>
+    <label class="sr-only" for="user">Proxy User</label>
+    <%= hidden_field_tag :user, nil, data: { grantor: current_user.to_param } %>
+  </div>
+
+  <div class="col-xs-6">
+    <h3 class="panel-title">Current Proxies</h3>
+    <table class="table table-condensed table-striped" id="authorizedProxies">
+      <tbody>
+        <% @user.can_receive_deposits_from.each do |depositor| %>
+          <tr><td class="depositor-name"><%= depositor.name %></td>
+            <td><%= link_to(sufia.user_depositor_path(@user, depositor), method: :delete, class: "remove-proxy-button") do %>
+              <i class="glyphicon glyphicon-remove"></i><% end %>
+            </td></tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+
+</div>

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

@@ -0,0 +1,14 @@
+<div class="row">
+  <div class="col-xs-12 col-sm-9">
+    <h4>Sent</h4>
+  </div>
+  <div class="col-xs-12 col-sm-3 transfer_link">
+    <%= link_to sufia.dashboard_files_path  do %>
+        <%= t("sufia.dashboard.transfer_files_link") %>
+    <% end %>
+  </div>
+</div>
+<%= render_sent_transfers %>
+
+<h4>Received</h4>
+<%= render_received_transfers %>

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

@@ -0,0 +1,5 @@
+<%= @proxy_deposit_request.sending_user %> has deposited the file <%= @generic_file.title %> on your behalf.
+
+<%= form_for @proxy_deposit_request do |f| %>
+  <% f.submit "Accept" %>
+<% end %>

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

@@ -1,6 +1,11 @@
-<%= form_for(@generic_file, url: sufia.generic_files_path, html: {multipart: true, id: 'fileupload'}) do |f| %>
+<%= form_for(@generic_file, url: sufia.generic_files_path, html: { multipart: true, id: 'fileupload' }) do |f| %>
+  <% unless current_user.can_make_deposits_for.empty? %>
+    <div class="controls">
+      <%= label_tag :on_behalf_of, 'On Behalf of' %>
+      <%= select_tag :on_behalf_of, options_for_select(current_user.can_make_deposits_for), prompt: "Yourself" %>
+    </div>
+  <% end %>
   <div class="well">
     <%= render partial: 'generic_files/upload/form_fields' %>
   </div>
 <% end %>
-

data/app/views/my/_action_menu.html.erb

@@ -27,6 +27,8 @@
         <i aria-hidden="true" class='glyphicon glyphicon-star'></i> <%= text %>
       <% end %>
     </li>
+    <li>
+      <%= link_to raw('<i class="glyphicon glyphicon-transfer" aria-hidden="true"></i> Transfer Ownership of File'), sufia.new_generic_file_transfer_path(noid), class: 'itemicon itemtransfer', title: 'Transfer Ownership of File' if gf.depositor == @user.user_key %>
+    </li>
   </ul>
 </div>
-

data/app/views/records/edit_fields/_default.html.erb

@@ -1,6 +1,6 @@
       <div <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
         <% required = render_req && (index == 0) && record.required?(key) %>
         <%= f.text_field :title, name: "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "input-large", required: required  %>
-        <%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index } %>
+        <%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index, single: f.object.class.unique?(key) } %>
       </div>
       <div id="additional_<%= key %>_elements"></div>

data/app/views/transfers/_received.html.erb

@@ -0,0 +1,58 @@
+<table class="table table-striped" id="incoming-transfers">
+  <thead>
+    <tr>
+      <th>Title</th>
+      <th>Date</th>
+      <th>From</th>
+      <th>Status</th>
+      <th>Comments</th>
+    </tr>
+  </thead>
+  <tbody>
+  <% @incoming.each do |req| %>
+    <% unless req.sending_user.blank? %>
+    <tr>
+      <td> <%= show_transfer_request_title(req) %> </td>
+      <td class="sorts-dash">
+        <% if req.created_at > Time.now.beginning_of_day %>
+          <%= "#{time_ago_in_words(req.created_at)} ago"%>
+        <% else %>
+          <%= req.created_at.strftime("%b %d %Y") %>
+        <% end %>
+      </td>
+      <td><%= link_to req.sending_user.name, sufia.profile_path(req.sending_user)  %></td>
+      <td>
+        <% if req.pending? %>
+            <div class="btn-group">
+              <button class="btn btn-primary" href="#">Accept</button>
+              <button class="btn btn-small dropdown-toggle accept" data-toggle="dropdown" href="#"><span class="caret"></span></button>
+              <ul class="dropdown-menu">
+                <li>
+                  <%= link_to 'Allow depositor to retain edit access', sufia.accept_transfer_path(req), method: :put, class: 'accept-retain', title: 'Accept the file and allow the original depositor to retain access to edit the file and metadat'  %>
+                </li>
+                <li>
+                  <%= link_to 'Remove depositor access', sufia.accept_transfer_path(req, reset: true), method: :put, class: 'accept-reset', title: 'Accept the file remove access from the original depositor.' %>
+                </li>
+                <li>
+                  <%= link_to 'Authorize depositor as proxy', sufia.accept_transfer_path(req, sticky: true), method: :put, class: 'accept-stick', title: 'Accept the file and allow the original depositor to retain access and authorize the original depositor as a proxy to deposit file on your behalf.' %>
+                </li>
+              </ul>
+            </div>
+
+          <%#= button_to "Accept and allow depositor to retain edit access", sufia.accept_transfer_path(req), method: :put, class: 'btn btn-primary' %>
+          <%#= button_to "Accept and reset access", sufia.accept_transfer_path(req, reset: true), method: :put, class: 'btn btn-primary' %>
+          <%#= button_to "Accept & Authorize Proxy", sufia.accept_transfer_path(req, sticky: true), method: :put, class: 'btn btn-primary' %>
+          <%= button_to "Reject", sufia.reject_transfer_path(req), method: :put, class: 'btn btn-danger', data: {confirm: "Are you sure you want to reject this request?"} %>
+        <% else %>
+          <%= req.status.capitalize %>
+        <% end %>
+      </td>
+
+      <td><%= req.sender_comment %></td>
+    </tr>
+    <% else %>
+      <% Rails.logger.error "A proxy request has no sender: #{req.inspect}" %>
+    <% end %>
+  <% end %>
+  </tbody>
+</table>

data/app/views/transfers/_sent.html.erb

@@ -0,0 +1,38 @@
+<table class="table table-striped" id="outgoing-transfers">
+  <thead>
+    <tr>
+      <th>Title</th>
+      <th>Date</th>
+      <th>To</th>
+      <th>Status</th>
+      <th>Comments</th>
+    </tr>
+  </thead>
+  <tbody>
+  <% @outgoing.each do |req| %>
+    <% unless req.receiving_user.blank? %>
+    <tr>
+      <td> <%= show_transfer_request_title(req) %> </td>
+      <td class="sorts-dash">
+        <% if req.created_at > Time.now.beginning_of_day %>
+          <%= "#{time_ago_in_words(req.created_at)} ago"%>
+        <% else %>
+          <%= req.created_at.strftime("%b %d %Y") %>
+        <% end %>
+      </td>
+      <td><%= link_to req.receiving_user.name, sufia.profile_path(req.receiving_user)  %></td>
+      <td>
+        <% if req.pending? %>
+          <%= button_to "Cancel", sufia.transfer_path(req), method: :delete, class:'btn btn-danger', data: {confirm: "Are you sure you want to cancel this request?"} %>
+        <% else %>
+          <%= req.status.capitalize %>
+        <% end %>
+      </td>
+      <td><%= req.sender_comment %></td>
+    </tr>
+  <% else %>
+      <% Rails.logger.error "A proxy request has no receiver: #{req.inspect}" %>
+  <% end %>
+  <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,7 @@
+<h1>Transfer of Ownership</h1>
+
+<h2>Sent</h2>
+<%= render_sent_transfers %>
+
+<h2>Received</h2>
+<%= render_received_transfers %>

data/app/views/transfers/new.html.erb

@@ -0,0 +1,23 @@
+<h1>Transfer ownership of "<%= @proxy_deposit_request.title %>"</h1>
+<span class="sr-only">Select a user to transfer <%= @proxy_deposit_request.title %> to, add optional comments and then press transfer.</span>
+<%= form_for @proxy_deposit_request, url: sufia.generic_file_transfers_path(@generic_file), html: {class: 'form-horizontal', id: 'new_transfer'} do |f| %>
+  <div class="well">
+    <%= error_messages_for(f.object) %>
+    <div class="control-group">
+      <%= f.label :transfer_to, "User", class: 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :transfer_to, "aria-hidden" => true %>
+      </div>
+    </div>
+    <div class="control-group">
+      <%= f.label :sender_comment, "Comments", class: 'control-label' %>
+      <div class="controls">
+      <%= f.text_area :sender_comment %>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-actions">
+    <%= f.submit "Transfer", class: 'btn btn-primary', data: {confirm: "Are you sure you want to transfer ownership of this file to another user? Click Ok to transfer or Cancel to return to the transfer screen"} %>
+  </div>
+<% end %>

data/app/views/users/_proxies.html.erb

@@ -0,0 +1,8 @@
+        <div class="tab-pane" id="proxies">
+          <h2>Proxies</h2>
+          <% @user.can_receive_deposits_from.each do |depositor| %>
+              <tr><td><%= link_to_profile depositor.user_key %></td>
+              </tr>
+          <% end %>
+
+        </div> <!-- /profile -->

data/app/views/users/_user_util_links_extra.html.erb

@@ -2,3 +2,4 @@
 <% # render on the user utility button using the sample HTML shown below %>
 <% # %>
 <% # <li><%= link_to 'text', 'path', id: 'extra_nav_link' </li> %>
+<li><%= link_to raw('<i class="glyphicon glyphicon-transfer"></i> transfer requests'), sufia.transfers_path, id: 'transfer_nav_link'  %></li>

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

@@ -1,5 +1,6 @@
 <h1>Edit Profile</h1>
-<div class="col-xs-12 col-sm-5 well">
+<div class="col-xs-12 col-sm-5">
+  <div class="well">
   <%= form_for @user, url: sufia.profile_path(@user.to_param), html: {multipart: true, class: 'form-horizontal' } do |f| %>
     <div class="form-group">
       <%= f.label :avatar, '<i class="glyphicon glyphicon-camera"></i> Change picture'.html_safe, class: "col-xs-4 control-label" %>
@@ -53,6 +54,10 @@
 
     <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Profile'.html_safe, type: 'submit', class: "btn btn-primary" %>
   <% end %>
+  </div>
+  <div class="well">
+    <%= render partial: 'dashboard/_index_partials/proxy_rights' %>
+  </div>
 </div><!-- .col-xs-5 /well-->
 
 <div class="col-xs-12 col-sm-offset-1 col-sm-6 well">