Fix disabled Continue button on user agreements page. No issue #

diff --git a/apps/workbench/app/assets/javascripts/user_agreements.js b/apps/workbench/app/assets/javascripts/user_agreements.js
index 688bd0b29ac4c67907a8af723dbebf3efe6439c7..1b9ce4b6847de3dd87b0abf000d3c448e3e238b0 100644 (file)
--- a/apps/workbench/app/assets/javascripts/user_agreements.js
+++ b/apps/workbench/app/assets/javascripts/user_agreements.js
@@ -1,9 +1,7 @@
-$('#open_user_agreement input[name="checked[]"]').on('click', function() {
-    var dialog = $('#open_user_agreement')[0]
-    $('input[type=submit]', dialog).prop('disabled',false);
-    $('input[name="checked[]"]', dialog).each(function(){
-        if(!this.checked) {
-            $('input[type=submit]', dialog).prop('disabled',true);
-        }
-    });
-});
+function enable_okbutton() {
+    var $div = $('#open_user_agreement');
+    var allchecked = $('input[name="checked[]"]', $div).not(':checked').length == 0;
+    $('input[type=submit]', $div).prop('disabled', !allchecked);
+}
+$(document).on('click keyup input', '#open_user_agreement input', enable_okbutton);
+$(document).on('ready ajax:complete', enable_okbutton);

diff --git a/apps/workbench/app/views/user_agreements/index.html.erb b/apps/workbench/app/views/user_agreements/index.html.erb
index d37360188dfee5a9f6fc366214ef35db7e6dddaf..d73ccffef8ddde3d6961975f3b64bf9cc4e8901f 100644 (file)
--- a/apps/workbench/app/views/user_agreements/index.html.erb
+++ b/apps/workbench/app/views/user_agreements/index.html.erb
@@ -23,17 +23,19 @@ User agreements
   <div>
     <% unsigned_user_agreements.each do |ua| %>
     <% ua.files.each do |file| %>
-    <%= f.label 'checked[]', class: 'checkbox inline' do %>
-    <%= check_box_tag 'checked[]', "#{ua.uuid}/#{file[0]}/#{file[1]}", false %>
-    Accept <%= file[1].sub(/\.[a-z]{3,4}$/,'') %>
-    <%= link_to 'View agreement', {controller: 'collections', action: 'show_file', uuid: ua.uuid, file: "#{file[0]}/#{file[1]}"}, {target: '_blank', class: 'btn btn-mini btn-primary'} %>
-    <% end %>
+    <div class="checkbox">
+      <%= f.label 'checked[]' do %>
+      <%= check_box_tag 'checked[]', "#{ua.uuid}/#{file[0]}/#{file[1]}", false %>
+      Accept <%= file[1].sub(/\.[a-z]{3,4}$/,'') %>
+      <%= link_to 'View agreement', {controller: 'collections', action: 'show_file', uuid: ua.uuid, file: "#{file[0]}/#{file[1]}"}, {target: '_blank', class: 'btn btn-xs btn-info'} %>
+      <% end %>
+    </div>
     <% end %>
     <% end %>
   </div>
   <div style="height: 1em"></div>
   <div>
-    <%= f.submit 'Continue', {class: 'btn btn-primary', disabled: true} %>
+    <%= f.submit 'Continue', {class: 'btn btn-primary'} %>
   </div>
 </div>
 <% end %>