3177: restrict only one file selection in collection chooser; remove clippy; clear...

diff --git a/apps/workbench/app/assets/javascripts/select_modal.js b/apps/workbench/app/assets/javascripts/select_modal.js
index 36c145fc02e48fa95d7b6ab3523a97f8ca956485..d84037763c77b8a33e0478511c0e92c4f8e84170 100644 (file)
--- a/apps/workbench/app/assets/javascripts/select_modal.js
+++ b/apps/workbench/app/assets/javascripts/select_modal.js
@@ -35,8 +35,14 @@ $(document).on('click', '.selectable', function() {
             });
     }
 }).on('click', '.persistent-selection', function() {
+    var checked_status = this.checked;
     var $modal = $(this).closest('.modal');
     $checked_selections = $modal.find('.persistent-selection:checked');
+
+    if (checked_status && ($checked_selections.length > 1)) {
+      $(this).prop('checked', false);
+    }
+
     any = ($checked_selections.length > 0);
     $(this).
         closest('.modal').

diff --git a/apps/workbench/app/assets/javascripts/selection.js.erb b/apps/workbench/app/assets/javascripts/selection.js.erb
index 59e6425698b4825a50f306d742017eacac9218e6..38f3f4a83f72a7dd433b670e99d010b1adc65728 100644 (file)
--- a/apps/workbench/app/assets/javascripts/selection.js.erb
+++ b/apps/workbench/app/assets/javascripts/selection.js.erb
@@ -108,7 +108,8 @@ jQuery(function($){
             }
         });
 
-    $(window).on('load storage', update_count);
+    $(window).on('load', clear_selections);
+    $(window).on('storage', update_count);
 
     $('#selection-form-content').on("click", function(e) {
         e.stopPropagation();

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 3fc0c92fcd8b1ef8cc400c979cf9d97f997d394b..9e966e148a9de3e54254259a7d1e911a35aaaaf7 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -67,19 +67,6 @@
               </ul>
             </li>
 
-            <li class="dropdown selection-menu">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                <span class="fa fa-lg fa-paperclip"></span>
-                <span class="badge" id="persistent-selection-count"></span>
-              </a>
-              <ul class="dropdown-menu" role="menu" id="persistent-selection-list">
-                <%= form_tag '/actions' do %>
-                  <%= hidden_field_tag 'uuid', @object.andand.uuid %>
-                  <div id="selection-form-content"></div>
-                <% end %>
-              </ul>
-            </li>
-
             <% if current_user.is_admin %>
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="system-menu">