X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/dfca93f7d608930350b8aa680a3ffb3d35d63306..a3222e35cda68c8e48a17921c33ac37ecb5c3bac:/apps/workbench/app/views/user_agreements/index.html.erb diff --git a/apps/workbench/app/views/user_agreements/index.html.erb b/apps/workbench/app/views/user_agreements/index.html.erb index acd5ba17cb..d37360188d 100644 --- a/apps/workbench/app/views/user_agreements/index.html.erb +++ b/apps/workbench/app/views/user_agreements/index.html.erb @@ -1,27 +1,27 @@ -<% content_for :breadcrumbs do '' end %> +<% content_for :breadcrumbs do raw '' end %> -<% n_files = @required_user_agreements.collect(&:files).flatten(1).count %> +<% n_files = unsigned_user_agreements.collect(&:files).flatten(1).count %> <% content_for :page_title do %> <% if n_files == 1 %> -<%= @required_user_agreements.first.files.first[1].sub(/\.[a-z]{3,4}$/,'') %> +<%= unsigned_user_agreements.first.files.first[1].sub(/\.[a-z]{3,4}$/,'') %> <% else %> User agreements <% end %> <% end %> -<%= form_for(@required_user_agreements.first, {url: {action: 'sign', controller: 'user_agreements'}}) do |f| %> +<%= form_for(unsigned_user_agreements.first, {url: {action: 'sign', controller: 'user_agreements'}, method: 'post'}) do |f| %> <%= hidden_field_tag :return_to, request.url %>
Please check <%= n_files > 1 ? 'each' : 'the' %> box below to indicate that you have read and accepted the user agreement<%= 's' if n_files > 1 %>.
<% if n_files == 1 and (Rails.configuration.show_user_agreement_inline rescue false) %> - <% ua = @required_user_agreements.first; file = ua.files.first %> + <% ua = unsigned_user_agreements.first; file = ua.files.first %> " type="<%= Rack::Mime::MIME_TYPES[file[1].match(/\.\w+$/)[0]] rescue '' %>" width="100%" height="400px"> <% end %>
- <% @required_user_agreements.each do |ua| %> + <% 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 %> @@ -37,15 +37,3 @@ User agreements
<% end %> - -<% content_for :footer_js do %> -$('#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); - } - }); -}); -<% end %>