Download as
Browse Code »

Commit f1bd38259732ab15df63128196dbe05e695e4bef

Authored by Aurélio A. Heckert
1 parent a83e415d
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

Confirm if env templates are set as template 

Adds "if <profile>.is_template" to <profile>_template methods.
Showing 1 changed file with 8 additions and 4 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @f1bd382
@@ -681,7 +681,8 @@ class Environment &lt; ActiveRecord::Base @@ -681,7 +681,8 @@ class Environment &lt; ActiveRecord::Base
681 end 681 end
682 682
683 def community_template 683 def community_template
684 - Community.find_by_id settings[:community_template_id] 684 + template = Community.find_by_id settings[:community_template_id]
  685 + template if template && template.is_template
685 end 686 end
686 687
687 def community_template=(value) 688 def community_template=(value)
@@ -689,7 +690,8 @@ class Environment &lt; ActiveRecord::Base @@ -689,7 +690,8 @@ class Environment &lt; ActiveRecord::Base
689 end 690 end
690 691
691 def person_template 692 def person_template
692 - Person.find_by_id settings[:person_template_id] 693 + template = Person.find_by_id settings[:person_template_id]
  694 + template if template && template.is_template
693 end 695 end
694 696
695 def person_template=(value) 697 def person_template=(value)
@@ -697,7 +699,8 @@ class Environment &lt; ActiveRecord::Base @@ -697,7 +699,8 @@ class Environment &lt; ActiveRecord::Base
697 end 699 end
698 700
699 def enterprise_template 701 def enterprise_template
700 - Enterprise.find_by_id settings[:enterprise_template_id] 702 + template = Enterprise.find_by_id settings[:enterprise_template_id]
  703 + template if template && template.is_template
701 end 704 end
702 705
703 def enterprise_template=(value) 706 def enterprise_template=(value)
@@ -705,7 +708,8 @@ class Environment &lt; ActiveRecord::Base @@ -705,7 +708,8 @@ class Environment &lt; ActiveRecord::Base
705 end 708 end
706 709
707 def inactive_enterprise_template 710 def inactive_enterprise_template
708 - Enterprise.find_by_id settings[:inactive_enterprise_template_id] 711 + template = Enterprise.find_by_id settings[:inactive_enterprise_template_id]
  712 + template if template && template.is_template
709 end 713 end
710 714
711 def inactive_enterprise_template=(value) 715 def inactive_enterprise_template=(value)