Download as
Browse Code »

Commit 009e101d6698acc2a4feb573215b17deeb4f7857

Authored by Rodrigo Souto
2 parents c0e78638 427a2565
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 commit 'refs/merge-requests/349' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/349
Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @009e101
@@ -298,7 +298,7 @@ class Profile < ActiveRecord::Base @@ -298,7 +298,7 @@ class Profile < ActiveRecord::Base
298 validate :valid_template 298 validate :valid_template
299 299
300 def valid_template 300 def valid_template
301 - if template_id.present? and !template.is_template 301 + if template_id.present? && template && !template.is_template
302 errors.add(:template, _('is not a template.')) 302 errors.add(:template, _('is not a template.'))
303 end 303 end
304 end 304 end
test/unit/profile_test.rb
  Diff comments   View file @009e101
@@ -1379,6 +1379,16 @@ class ProfileTest < ActiveSupport::TestCase @@ -1379,6 +1379,16 @@ class ProfileTest < ActiveSupport::TestCase
1379 assert_not_includes Profile.templates(Environment.default), profile 1379 assert_not_includes Profile.templates(Environment.default), profile
1380 end 1380 end
1381 1381
  1382 + should 'not crash on a profile update with a destroyed template' do
  1383 + template = fast_create(Profile, :is_template => true)
  1384 + profile = fast_create(Profile, :template_id => template.id)
  1385 + template.destroy
  1386 +
  1387 + assert_nothing_raised do
  1388 + Profile.find(profile.id).save!
  1389 + end
  1390 + end
  1391 +
1382 should 'provide URL to leave' do 1392 should 'provide URL to leave' do
1383 profile = build(Profile, :identifier => 'testprofile') 1393 profile = build(Profile, :identifier => 'testprofile')
1384 assert_equal({ :profile => 'testprofile', :controller => 'profile', :action => 'leave', :reload => false}, profile.leave_url) 1394 assert_equal({ :profile => 'testprofile', :controller => 'profile', :action => 'leave', :reload => false}, profile.leave_url)