Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addresses punchlist items #716

Merged
merged 2 commits into from
Jun 2, 2021
Merged

Addresses punchlist items #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a923861
Fixes items identified in ETD-339
matt-bernhardt Jun 1, 2021
601418e
Fixes items identified in ETD-340
matt-bernhardt Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/mailers/receipt_mailer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion app/views/receipt_mailer/transfer_receipt_email.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ul>
<li>We will not begin processing theses until after graduation.</li>
<li>Theses will be published in <a href="https://dspace.mit.edu/handle/1721.1/7582">DSpace@MIT</a>, it may take up to 3 months for theses to appear in the collection.</li>
<li>Theses will be published in <a href="https://dspace.mit.edu/handle/1721.1/7582">DSpace@MIT</a>, it may take 3 months for theses to appear in the collection.</li>
</ul>

<p>Files transferred:</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/transfer/confirm.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h4>A couple reminders:</h4>
<ul>
<li>We will not begin processing theses until after graduation.</li>
<li>Theses will be published in <a href="https://dspace.mit.edu/handle/1721.1/7582">DSpace@MIT</a>, it may take up to 3 months for theses to appear in the collection.</li>
<li>Theses will be published in <a href="https://dspace.mit.edu/handle/1721.1/7582">DSpace@MIT</a>, it may take 3 months for theses to appear in the collection.</li>
</ul>

<p>Please contact us at <a href="mailto:mit-theses <mit-theses@mit.edu>" target="_blank">mit-theses@mit.edu</a> with any questions.</p>
12 changes: 7 additions & 5 deletions app/views/transfer/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@
<% if file.blob.attachments.where('record_type = ?', "Thesis").count == 0 %>
<label>
<%= check_box_tag( "transfer[file_ids][]", file.id, false, data: { "msg" => "Required - please select at least one file to transfer." }, class: "required" ) %>
<%= file.filename.to_s %>
<%= link_to rails_blob_path(file, disposition: 'inline'), target: :_blank do %>
<%= file.filename.to_s %>
<% end %>
</label>
<% else %>
<span class="assigned"><%= file.filename.to_s %></span> attached to "<%= title_helper( file.blob.attachments.where('record_type = ?', "Thesis").first.record ) %>"
<span class="assigned"><%= link_to rails_blob_path(file, disposition: 'inline'), target: :_blank do %><%= file.filename.to_s %><% end %></span> attached to "<%= title_helper( file.blob.attachments.where('record_type = ?', "Thesis").first.record ) %>"
<% end %>
</li>
<% end %>
Expand All @@ -67,7 +69,7 @@

<h4 class="thesis-heading">...to this thesis:</h4>
<table class="table list-theses" id="thesisTargets">
<caption>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.</caption>
<caption>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.</caption>
<thead>
<tr>
<th scope="col">Select</th>
Expand All @@ -82,9 +84,9 @@
</table>

<% 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 %>

Expand Down