From: Simon Poole <simon@poole.ch>
Date: Wed, 30 Jan 2019 09:20:47 +0000 (+0100)
Subject: Require that tou_read checkbox is set
X-Git-Tag: live~2597^2~10
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6d7a713c1224ae6a8a071e8796e6d1ce569a261b

Require that tou_read checkbox is set
---

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e382f1531..bbe60e39c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -36,7 +36,7 @@ class UsersController < ApplicationController
   def save
     @title = t "users.new.title"
 
-    if params[:decline]
+    if params[:decline] || !params[:read_tou] || params[:read_tou] == 0
       if current_user
         current_user.terms_seen = true
 
@@ -47,8 +47,10 @@ class UsersController < ApplicationController
         else
           redirect_to :action => :account, :display_name => current_user.display_name
         end
-      else
+      elsif params[:decline]
         redirect_to t("users.terms.declined")
+      else
+        redirect_to :action => :terms
       end
     elsif current_user
       unless current_user.terms_agreed?