Skip to content

ensure file suppressed message for permenantly suppressed files - no … #4

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
mfall3 merged 1 commit into from
Dec 18, 2025
Merged

ensure file suppressed message for permenantly suppressed files - no … #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion app/controllers/datasets_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,13 +499,14 @@ def permanently_suppress_files
authorize! :manage, @dataset
@dataset.publication_state = Databank::PublicationState::PermSuppress::FILE
@dataset.hold_state = Databank::PublicationState::PermSuppress::FILE
@dataset.embargo = Databank::PublicationState::Embargo::NONE
@dataset.tombstone_date = Date.current
begin
@dataset.remove_from_globus_download
respond_to do |format|
if @dataset.save
format.html {
redirect_to dataset_path(@dataset.key), notice: %(Dataset files have been permanently supressed.)
redirect_to dataset_path(@dataset.key), notice: %(Dataset files have been permanently suppressed.)
}
format.json { render :show, status: :ok, location: dataset_path(@dataset.key) }
else
Expand Down
2 changes: 1 addition & 1 deletion app/views/datasets/_file_restriction_alert.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-if dataset.publication_state == Databank::PublicationState::PermSuppress::FILE
-if dataset.publication_state == Databank::PublicationState::PermSuppress::FILE || dataset.hold_state == Databank::PublicationState::PermSuppress::FILE
.embargo-placeholder
Files associated with this dataset are not available.
%a(href="/help?context=embargo&key=#{dataset.key}")
Expand Down
1 change: 0 additions & 1 deletion app/views/datasets/_show_files.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
- dataset.complete_datafiles.each do |datafile|
.row.checkbox.filerow
%span.col-md-6(aria-label="Download")
-# check globus_only
-if @dataset_preserved
%label(for="#{datafile.web_id}_file_name")
%input(type="checkbox" class="checkFile checkFileGroup" id="#{datafile.web_id}_file_name" name="selected_files[]" value="#{datafile.web_id}" onchange="handleCheckFileGroupChange()")
Expand Down