Merge pull request #1231 from YaleSTC/1227_tos_bug_52

[1227] [v5.2] Fix broken ToS checkbox handling

Author: orenyk

CHANGELOG.md

@@ -2,6 +2,9 @@
 * This file will be updated whenever a new release is put into production.
 * Any problems should be reported via the "report an issue" link in the footer of the application.
 
+## v5.2.2 - 2015-04-20
+### Fixed
+* Forgetting to check off the ToS checkbox during checkout no longer causes checkout to fail silently ([#1227](https://github.com/YaleSTC/reservations/issues/1227)).
 
 ## v5.2.1 - 2015-04-14
 ### Fixed
@@ -170,6 +173,10 @@
 * Replaced Airbrake with Party Foul ([#501](https://github.com/YaleSTC/reservations/issues/501)).
 * The first user is now created as a superuser ([#753](https://github.com/YaleSTC/reservations/issues/753)).
 
+## v3.4.10 - 2015-04-20
+### Fixed
+* Forgetting to check off the ToS checkbox during checkout no longer causes checkout to fail silently ([#1227](https://github.com/YaleSTC/reservations/issues/1227)).
+
 ## v3.4.9 - 2015-03-16
 ### Fixed
 * Banned users can no longer have reservations created for them or equipment checked out to them ([#1185](https://github.com/YaleSTC/reservations/issues/1185)).

app/controllers/reservations_controller.rb

@@ -14,6 +14,7 @@ def set_user
     @user = User.find(params[:user_id])
     return unless @user.role == 'banned'
     flash[:error] = 'This user is banned and cannot check out equipment.'
+    params[:banned] = true
   end
 
   def set_reservation
@@ -355,15 +356,19 @@ def upcoming
   end
 
   def manage # initializer
-    redirect_to(root_path) && return unless flash[:error].nil?
+    if params[:banned] && current_user.view_mode != 'superuser'
+      redirect_to(root_path) && return
+    end
     @check_out_set = @user.due_for_checkout
     @check_in_set = @user.due_for_checkin
 
     render :manage, layout: 'application'
   end
 
   def current
-    redirect_to(root_path) && return unless flash[:error].nil?
+    if params[:banned] && current_user.view_mode != 'superuser'
+      redirect_to(root_path) && return
+    end
     @user_overdue_reservations_set =
       [Reservation.overdue.for_reserver(@user)].delete_if(&:empty?)
     @user_checked_out_today_reservations_set =