Download as
Browse Code »

Commit 1a854cf9062fad11a231e1730cca95913a4cb1da

Authored by Antonio Terceiro
2 parents 2cd9e2e5 0b067cf1
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'remote_user_fix' into 'master' 

Handle ActiveRecord::RecordInvalid exceptions in remote user plugin

Fix #612

See merge request !616
Showing 1 changed file with 4 additions and 1 deletions   Show diff stats
plugins/remote_user/lib/remote_user_plugin.rb
  Diff comments   View file @1a854cf
... ... @@ -48,8 +48,11 @@ class RemoteUserPlugin < Noosfero::Plugin
48 48 end
49 49 end
50 50 end
  51 + rescue ::ActiveRecord::RecordInvalid
  52 + session[:notice] = _('Could not create the remote user.')
  53 + render_404
51 54 rescue
52   - session[:notice] = _('Could not create the remote_user.')
  55 + session[:notice] = _("Could not log in.")
53 56 render_404
54 57 end
55 58 end
... ...