Merge branch 'issue-17343' into production.panel.sutty.nl

app/controllers/concerns/exception_handler.rb

@@ -10,8 +10,9 @@ module ExceptionHandler
   included do
     rescue_from SiteNotFound, with: :site_not_found
     rescue_from PageNotFound, with: :page_not_found
-    rescue_from Pundit::NotAuthorizedError, with: :page_not_found
-    rescue_from Pundit::Error, with: :page_unauthorized
+    rescue_from Pundit::Error, with: :page_not_found
+    rescue_from Pundit::NotAuthorizedError, with: :page_unauthorized
+    rescue_from Pundit::NilPolicyError, with: :page_not_found
     rescue_from ActionController::RoutingError, with: :page_not_found
     rescue_from ActionController::ParameterMissing, with: :page_not_found
   end

app/controllers/posts_controller.rb

@@ -15,6 +15,8 @@ class PostsController < ApplicationController
   # Las URLs siempre llevan el idioma actual o el de le usuarie
   def default_url_options
     { locale: locale }
+  rescue SiteNotFound
+    {}
   end
 
   # @todo Mover a tu propio scope

app/controllers/usuaries_controller.rb

@@ -29,7 +29,7 @@ class UsuariesController < ApplicationController
 
     @usuarie = Usuarie.find(params[:id])
 
-    if @site.usuaries.count > 1
+    if @site.invitade?(@usuarie) || @site.usuaries.count > 1
       # Mágicamente elimina el rol
       @usuarie.sites.delete(@site)
     else