Skip to content

NRMI-252 update #1244

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
reemi1510 merged 4 commits into from
Mar 9, 2026
Merged

NRMI-252 update #1244

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ab6c1e
updated error handling again
reemi1510 Mar 9, 2026
84843db
Merge branch 'develop' into feature/nrmi-252-add-archiving-error-mess…
reemi1510 Mar 9, 2026
674f7d9
rubocop
reemi1510 Mar 9, 2026
9f5ed3a
Merge branch 'feature/nrmi-252-add-archiving-error-messaging' of gith…
reemi1510 Mar 9, 2026
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
6 changes: 2 additions & 4 deletions app/controllers/admin/frameworks_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ def publish

def archive_confirmation; end

# rubocop:disable Metrics/AbcSize
def archive
@framework.errors.clear

Expand All @@ -89,15 +88,14 @@ def archive
return redirect_to admin_framework_path(@framework)
end

if @framework.archive
if @framework.archive!
flash[:success] = 'Framework archived successfully.'
else
flash[:failure] = @framework.errors.full_messages.to_sentence.presence || 'Error archiving framework.'
flash[:failure] = 'Error archiving framework: FDL does not pass validation.'
end

redirect_to admin_framework_path(@framework)
end
# rubocop:enable Metrics/AbcSize

def unarchive_confirmation; end

Expand Down