From a923861ff121a2173f5593ec88b2302b876adf51 Mon Sep 17 00:00:00 2001 From: Matt Bernhardt Date: Tue, 1 Jun 2021 15:34:15 -0400 Subject: [PATCH 1/2] Fixes items identified in ETD-339 --- app/views/transfer/show.html.erb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/transfer/show.html.erb b/app/views/transfer/show.html.erb index c05ec14d..e6467012 100644 --- a/app/views/transfer/show.html.erb +++ b/app/views/transfer/show.html.erb @@ -55,10 +55,12 @@ <% if file.blob.attachments.where('record_type = ?', "Thesis").count == 0 %> <% else %> - <%= file.filename.to_s %> attached to "<%= title_helper( file.blob.attachments.where('record_type = ?', "Thesis").first.record ) %>" + <%= link_to rails_blob_path(file, disposition: 'inline'), target: :_blank do %><%= file.filename.to_s %><% end %> attached to "<%= title_helper( file.blob.attachments.where('record_type = ?', "Thesis").first.record ) %>" <% end %> <% end %> @@ -67,7 +69,7 @@

...to this thesis:

- + @@ -82,9 +84,9 @@
Select the thesis to receive the files. If the needed thesis is not in this list, edit either the transfer or thesis record in <%= link_to("the administrative interface", admin_root_path) %> so they share a department and graduation date.Select the thesis to receive the files. If the needed thesis is not in this list, edit either the transfer or thesis record in <%= link_to("the administrative interface", admin_authors_path, target: :_blank) %> so they share a department and graduation date.
Select
<% if @transfer.unassigned_files == 0 %> - <%= submit_tag('All files assigned', class: 'btn button-secondary disabled', disabled: true) %> + <%= submit_tag('All files matched', class: 'btn button-secondary disabled', disabled: true) %> <% else %> - <%= submit_tag('Transfer files', class: 'btn button-primary') %> + <%= submit_tag('Match', class: 'btn button-primary') %> <% end %> <% end %> From 601418ecb3e03f574bd2a664a52f5bca08a6d674 Mon Sep 17 00:00:00 2001 From: Matt Bernhardt Date: Tue, 1 Jun 2021 16:10:50 -0400 Subject: [PATCH 2/2] Fixes items identified in ETD-340 --- app/mailers/receipt_mailer.rb | 1 + app/views/receipt_mailer/transfer_receipt_email.html.erb | 2 +- app/views/transfer/confirm.html.erb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/mailers/receipt_mailer.rb b/app/mailers/receipt_mailer.rb index db5e9f10..327912fa 100644 --- a/app/mailers/receipt_mailer.rb +++ b/app/mailers/receipt_mailer.rb @@ -14,6 +14,7 @@ def transfer_receipt_email(transfer, user) @transfer = transfer mail(from: "MIT Libraries <#{ENV['THESIS_ADMIN_EMAIL']}>", to: @user.email, + cc: ENV['THESIS_ADMIN_EMAIL'], subject: 'Thesis files transferred') end end diff --git a/app/views/receipt_mailer/transfer_receipt_email.html.erb b/app/views/receipt_mailer/transfer_receipt_email.html.erb index 687c6b4c..74494412 100644 --- a/app/views/receipt_mailer/transfer_receipt_email.html.erb +++ b/app/views/receipt_mailer/transfer_receipt_email.html.erb @@ -6,7 +6,7 @@

Files transferred:

diff --git a/app/views/transfer/confirm.html.erb b/app/views/transfer/confirm.html.erb index 7176bee7..84ef6701 100644 --- a/app/views/transfer/confirm.html.erb +++ b/app/views/transfer/confirm.html.erb @@ -1,7 +1,7 @@

A couple reminders:

Please contact us at mit-theses@mit.edu with any questions.