Guest User

Untitled

a guest
Jan 21st, 2018
57
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.24 KB | None | 0 0
  1. ~/sync/rails/gsoft$ svn diff -r 965:HEAD app/controllers/user_controller.rb
  2. Index: app/controllers/user_controller.rb
  3. ===================================================================
  4. --- app/controllers/user_controller.rb (revision 965)
  5. +++ app/controllers/user_controller.rb (revision 974)
  6. @@ -1,3 +1,5 @@
  7. +require 'pp'
  8. +
  9. class UserController < ChurchController
  10.  
  11. prepend_before_filter :require_ssl, :only => [:create, :edit, :settings]
  12. @@ -307,13 +309,20 @@
  13. helper.validateData @user, service_user, params
  14.  
  15. # Ask our helper for objects they want to save or destroy
  16. - new_objects, del_objects = helper.saveData @user, service_user, params
  17. + new_objects, del_objects, post_save = helper.saveData @user, service_user, params
  18. if new_objects
  19. to_be_saved.concat [new_objects].flatten
  20. end
  21. if del_objects
  22. to_be_destroyed.concat [del_objects].flatten
  23. end
  24. + if post_save
  25. + begin
  26. + post_save.call({ :current_user => @current_user, :controller => self })
  27. + rescue Exception => e
  28. + @user.errors.add_to_base(e.message)
  29. + end
  30. + end
  31. end
  32.  
  33. # Validate dependent objects, collecting errors in @user.
Add Comment
Please, Sign In to add comment