diff --git a/app/controllers/datasets_controller.rb b/app/controllers/datasets_controller.rb index aec93c7..f2c0523 100644 --- a/app/controllers/datasets_controller.rb +++ b/app/controllers/datasets_controller.rb @@ -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 diff --git a/app/views/datasets/_file_restriction_alert.html.haml b/app/views/datasets/_file_restriction_alert.html.haml index 52c0a1a..7667311 100644 --- a/app/views/datasets/_file_restriction_alert.html.haml +++ b/app/views/datasets/_file_restriction_alert.html.haml @@ -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}") diff --git a/app/views/datasets/_show_files.html.haml b/app/views/datasets/_show_files.html.haml index d3c5316..72769a3 100644 --- a/app/views/datasets/_show_files.html.haml +++ b/app/views/datasets/_show_files.html.haml @@ -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()")