Removed unused FileSetController and other methods

Fixes #1703 Fixes #1380
samvera-deprecated · Apr 5, 2016 · 49bd77d · 49bd77d
1 parent c9fad49
commit 49bd77d
Show file tree

Hide file tree

Showing 35 changed files with 81 additions and 793 deletions.
diff --git a/app/controllers/concerns/sufia/controller.rb b/app/controllers/concerns/sufia/controller.rb
@@ -5,6 +5,7 @@ module Sufia::Controller
     # Adds Hydra behaviors into the application controller
     include Hydra::Controller::ControllerBehavior
 
+    # TODO: this makes everything slower.  Move this to an Async call.
     before_action :notifications_number
   end
 
@@ -19,12 +20,12 @@ def render_500(exception)
 
   def notifications_number
     @notify_number = 0
-    @upload_sets = []
+    @processed_works = []
     return if action_name == "index" && controller_name == "mailbox"
     return unless user_signed_in?
     @notify_number = current_user.mailbox.inbox(unread: true).count
     # Extract the ids of the upload sets that have completed batch processing
-    @upload_sets = current_user.mailbox.inbox.map { |msg| msg.last_message.body[/<span id="(.*)"><a (href=|data-content=|data-toggle=)(.*)/, 1] }.select { |val| !val.blank? }
+    @processed_works = current_user.mailbox.inbox.map { |msg| msg.last_message.body[/<span id="(.*)"><a (href=|data-content=|data-toggle=)(.*)/, 1] }.select { |val| !val.blank? }
   end
 
   # Override Devise method to redirect to dashboard after signing in

diff --git a/app/controllers/concerns/sufia/file_sets_controller/upload_complete_behavior.rb b/app/controllers/concerns/sufia/file_sets_controller/upload_complete_behavior.rb
diff --git a/app/controllers/concerns/sufia/file_sets_controller_behavior.rb b/app/controllers/concerns/sufia/file_sets_controller_behavior.rb
@@ -2,16 +2,15 @@ module Sufia
   module FileSetsController
     extend ActiveSupport::Autoload
     autoload :BrowseEverything
-    autoload :UploadCompleteBehavior
   end
+
   module FileSetsControllerBehavior
     extend ActiveSupport::Concern
     include Sufia::Breadcrumbs
 
     included do
       include Blacklight::Configurable
       include Sufia::FileSetsController::BrowseEverything
-      extend Sufia::FileSetsController::UploadCompleteBehavior
 
       layout "sufia-one-column"
 
@@ -28,10 +27,6 @@ module FileSetsControllerBehavior
       self.form_class = Sufia::Forms::FileSetEditForm
     end
 
-    def new
-      @upload_set_id = SecureRandom.uuid
-    end
-
     # routed to /files/:id/stats
     def stats
       @stats = FileUsage.new(params[:id])

diff --git a/app/controllers/concerns/sufia/upload_sets_controller_behavior.rb b/app/controllers/concerns/sufia/upload_sets_controller_behavior.rb
@@ -12,12 +12,6 @@ module UploadSetsControllerBehavior
       self.edit_form_class = Sufia::UploadSetForm
     end
 
-    def edit
-      # TODO: redlock this line so that two processes don't attempt to create at the same time.
-      @upload_set = UploadSet.find_or_create(params[:id])
-      @form = edit_form
-    end
-
     def update
       authenticate_user!
       @upload_set = UploadSet.find(params[:id])

diff --git a/app/services/sufia/import_local_file_failure_service.rb b/app/services/sufia/import_local_file_failure_service.rb
diff --git a/app/services/sufia/import_local_file_success_service.rb b/app/services/sufia/import_local_file_success_service.rb
diff --git a/app/services/sufia/ingest_local_file_service.rb b/app/services/sufia/ingest_local_file_service.rb
diff --git a/...rns/file_sets/_browse_everything.html.erb → ...concerns/base/_browse_everything.html.erb b/...rns/file_sets/_browse_everything.html.erb → ...concerns/base/_browse_everything.html.erb
@@ -1,10 +1,8 @@
-<%= render 'curation_concerns/file_sets/upload/agreement' %>
 <div class="alert alert-success">
   <%=  t("sufia.upload.cloud_timeout_message", contact_href: link_to(t("sufia.upload.alert.contact_href_text"), sufia.contact_form_index_path)) %>
 </div>
 <div class="well">
-  <%= form_tag(sufia.new_curation_concerns_file_set_path, id: 'browse_everything_form', method: 'post') do %>
-      <%= render 'curation_concerns/file_sets/upload/tos_checkbox' %>
+  <%= form_tag(sufia.uploads_path, id: 'browse_everything_form', method: 'post') do %>
       <%= hidden_field_tag(:upload_set_id, @upload_set_id) %>
       <%= button_tag(t('sufia.upload.browse_everything.browse_files_button'), type: 'button', class: 'btn btn-lg btn-success', id: "browse-btn",
         'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,

diff --git a/app/views/curation_concerns/base/_form_progress.html.erb b/app/views/curation_concerns/base/_form_progress.html.erb
@@ -14,7 +14,14 @@
         <div class="list-group-item">
           <%= render 'form_visibility_component', f: f %>
         </div>
-
+        <% unless current_user.can_make_deposits_for.empty? %>
+          <div class="list-group-item">
+              <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>
+          </div>
+        <% end %>
         <div class="panel-footer text-center">
           <% if Sufia::Engine.config.active_deposit_agreement_acceptance %>
             <label>

diff --git a/app/views/curation_concerns/file_sets/_local_file_import.html.erb b/app/views/curation_concerns/file_sets/_local_file_import.html.erb
diff --git a/app/views/curation_concerns/file_sets/new.html.erb b/app/views/curation_concerns/file_sets/new.html.erb
diff --git a/app/views/curation_concerns/file_sets/upload/_agreement.html.erb b/app/views/curation_concerns/file_sets/upload/_agreement.html.erb
diff --git a/app/views/curation_concerns/file_sets/upload/_alerts.html.erb b/app/views/curation_concerns/file_sets/upload/_alerts.html.erb
diff --git a/app/views/curation_concerns/file_sets/upload/_form.html.erb b/app/views/curation_concerns/file_sets/upload/_form.html.erb
diff --git a/app/views/curation_concerns/file_sets/upload/_form_fields.html.erb b/app/views/curation_concerns/file_sets/upload/_form_fields.html.erb
diff --git a/app/views/curation_concerns/file_sets/upload/_local_file_import_chooser.html.erb b/app/views/curation_concerns/file_sets/upload/_local_file_import_chooser.html.erb
diff --git a/app/views/curation_concerns/file_sets/upload/_tos_checkbox.html.erb b/app/views/curation_concerns/file_sets/upload/_tos_checkbox.html.erb
diff --git a/app/views/upload_sets/_base_metadata.html.erb b/app/views/upload_sets/_base_metadata.html.erb
diff --git a/app/views/upload_sets/_edit.js.erb b/app/views/upload_sets/_edit.js.erb