Avoid error on CONFERENCE_RULES not defined

Hugo Melo
1 parent 06d895ac
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
views/gamification_plugin_badges/_form.html.erb
@@ -12,7 +12,7 @@
   <% end %>
  
   <% rules =  Merit::BadgeRules::AVAILABLE_RULES %>
-  <% rules.merge! Merit::BadgeRules::CONFERENCE_RULES %>
+  <% rules.merge! Merit::BadgeRules::CONFERENCE_RULES if defined? Merit::BadgeRules::CONFERENCE_RULES %>
   <div class="field" id="gamification-plugin-form-badge-name">
     <%= f.label :name %><br />
     <%= f.select :name, rules.map{ |key, rule| key } %>
...	...	@@ -12,7 +12,7 @@
12	12	<% end %>
13	13
14	14	<% rules = Merit::BadgeRules::AVAILABLE_RULES %>
15		- <% rules.merge! Merit::BadgeRules::CONFERENCE_RULES %>
	15	+ <% rules.merge! Merit::BadgeRules::CONFERENCE_RULES if defined? Merit::BadgeRules::CONFERENCE_RULES %>
16	16	<div class="field" id="gamification-plugin-form-badge-name">
17	17	<%= f.label :name %><br />
18	18	<%= f.select :name, rules.map{ \|key, rule\| key } %>
...	...