Browse Source

Handle submissions made by deleted users

Angus McLeod 6 years ago
parent
commit
af613c11d6
2 changed files with 12 additions and 1 deletions
  1. 5 0
      config/locales/server.en.yml
  2. 7 1
      controllers/admin.rb

+ 5 - 0
config/locales/server.en.yml

@@ -1,4 +1,9 @@
 en:
+  admin:
+    wizard:
+      submissions:
+        no_user: "deleted (id: %{id})"
+
   wizard:
     custom_title: "Wizard"
     field:

+ 7 - 1
controllers/admin.rb

@@ -148,7 +148,13 @@ class CustomWizard::AdminController < ::ApplicationController
 
     all_submissions = [*rows].map do |r|
       submissions = ::JSON.parse(r.value)
-      username = User.find(r.key).username
+
+      if user = User.find_by(id: r.key)
+        username = user.username
+      else
+        username = I18n.t('admin.wizard.submissions.no_user', id: r.key)
+      end
+
       submissions.map { |s| { username: username }.merge!(s.except("redirect_to")) }
     end.flatten