Merge branch 'fix/user_permission_removed_on_edit' into staging

Author: tsubik

app/admin/user.rb

@@ -10,7 +10,7 @@
     qc1_observer_ids: [], qc2_observer_ids: [],
     managed_observer_ids: [],
     responsible_for_country_ids: [],
-    user_permission_attributes: [:user_role]
+    user_permission_attributes: [:id, :user_role]
 
   filter :country, as: :select, collection: -> { Country.joins(:users).by_name_asc }
   filter :operator

app/controllers/application_controller.rb

@@ -43,7 +43,9 @@ def user_for_paper_trail
   private
 
   def backoffice_user?
-    current_user.user_permission.present? && current_user.is_active &&
-      %w[admin bo_manager].include?(current_user.user_permission.user_role)
+    current_user.is_active && %w[admin bo_manager].include?(current_user.user_permission.user_role)
+  rescue => e
+    Sentry.capture_exception(e)
+    raise SecurityError
   end
 end