diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-30 22:51:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-30 22:51:32 +0100 |
| commit | b54e263712a9f2b3d4ff0d7b692565d8e24dc03b (patch) | |
| tree | 88600c7253f9a929ae30cef4644e2663f41788e6 /app/controllers | |
| parent | 2ba6267f1603cee682bfe3885b797ad5df7e958f (diff) | |
| parent | 7679ddcd5ee289f847f8a4836a0b0220d433bae6 (diff) | |
Merge pull request #1673 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/account_owned_concern.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/concerns/account_owned_concern.rb b/app/controllers/concerns/account_owned_concern.rb index 62e379846..25149d03f 100644 --- a/app/controllers/concerns/account_owned_concern.rb +++ b/app/controllers/concerns/account_owned_concern.rb @@ -8,6 +8,7 @@ module AccountOwnedConcern before_action :set_account, if: :account_required? before_action :check_account_approval, if: :account_required? before_action :check_account_suspension, if: :account_required? + before_action :check_account_confirmation, if: :account_required? end private @@ -28,6 +29,10 @@ module AccountOwnedConcern not_found if @account.local? && @account.user_pending? end + def check_account_confirmation + not_found if @account.local? && !@account.user_confirmed? + end + def check_account_suspension if @account.suspended_permanently? permanent_suspension_response |