Skip to content

Hide unreleased attachments #1514

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

Merged
damianhxy merged 5 commits into from
May 17, 2022
Merged

Hide unreleased attachments #1514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a8f6f9
Only render released attachments
damianhxy May 2, 2022
9909505
Prevent unauthorized access to unreleased attachments
damianhxy May 2, 2022
0e04f57
Show assessment specific attachments
damianhxy May 17, 2022
e8c6713
Standardize Course attachments appearance
damianhxy May 17, 2022
ca1e0a9
Standardize Assessment attachments appearance
damianhxy May 17, 2022
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
5 changes: 5 additions & 0 deletions app/controllers/assessments_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,11 @@ def show
else
@cud
end
@attachments = if @cud.instructor?
@assessment.attachments
else
@assessment.attachments.where(released: true)
end
@submissions = @assessment.submissions.where(course_user_datum_id: @effectiveCud.id)
.order("version DESC")
@extension = @assessment.extensions.find_by(course_user_datum_id: @effectiveCud.id)
Expand Down
12 changes: 9 additions & 3 deletions app/controllers/attachments_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,15 @@ def show
flash[:error] = "Error loading #{@attachment.name} from #{@attachment.filename}"
redirect_to([@course, :attachments]) && return
end
# Set to application/octet-stream to force download
send_file(filename, disposition: "inline",
type: "application/octet-stream", filename: @attachment.filename) && return
if @cud.instructor? || @attachment.released?
# Set to application/octet-stream to force download
send_file(filename, disposition: "inline",
type: "application/octet-stream",
filename: @attachment.filename) && return
end

flash[:error] = "You are unauthorized to view this attachment"
redirect_to([@course, @assessment])
end

action_auth_level :edit, :instructor
Expand Down
2 changes: 1 addition & 1 deletion app/views/assessments/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<% if @attachments.any? %>
<div class="section">
<h3 class="section-title"><span class="white">Attachments</span></h3>
<ul class="attachments">
<ul class="collection with-header attachments">
<%= render @attachments %>
</ul>
</div>
Expand Down
50 changes: 26 additions & 24 deletions app/views/assessments/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,34 +175,36 @@
<% download_access = (@cud.instructor?) %>

<%# Display any attachments %>
<% if @assessment.attachments.length > 0 or @cud.instructor? %>
<h2>Handouts</h2>
<ul class="collection with-header attachments">
<%= render @assessment.attachments %>

<% # this code is temporarily "commented out" because Dan wants to preserve the logic for future changes to _attachment.html.erb %>
<% if false then %>
<% for a in @assessment.attachments do %>
<% if a.released? then %>
<% if (Time.now() > @assessment.start_at) or (@cud.instructor?) then %>
<li><%= link_to a.name, [@course, @assessment, a] %></li>
<% else %>
<li><%= a.name %></li>
<% if @attachments.any? or @cud.instructor? %>
<div class="section">
<h3 class="section-title"><span class="white">Attachments</span></h3>
<ul class="collection with-header attachments">
<%= render @attachments %>

<% # this code is temporarily "commented out" because Dan wants to preserve the logic for future changes to _attachment.html.erb %>
<% if false then %>
<% for a in @assessment.attachments do %>
<% if a.released? then %>
<% if (Time.now() > @assessment.start_at) or (@cud.instructor?) then %>
<li><%= link_to a.name, [@course, @assessment, a] %></li>
<% else %>
<li><%= a.name %></li>
<% end %>
<% elsif @cud.instructor? then %>
<li><i><%= link_to a.name, [@course, @assessment, a] %>*</i></li>
<% end %>
<% elsif @cud.instructor? then %>
<li><i><%= link_to a.name, [@course, @assessment, a] %>*</i></li>
<% end %>
<% end %>
<% if @cud.instructor? then %>
<li class="collection-item add">
<%= link_to new_course_assessment_attachment_path(@course, @assessment) do %>
<i class="material-icons left">note_add</i>Add Attachment
<% end %>
<span class="secondary-content"></span>
</li>
<% end %>
<% if @cud.instructor? then %>
<li class="collection-item add">
<%= link_to new_course_assessment_attachment_path(@course, @assessment) do %>
<i class="material-icons left">note_add</i>Add Attachment
<% end %>
<span class="secondary-content"></span>
</li>
<% end %>
</ul>
</ul>
</div>
<hr>

<% end %>
Expand Down