Merge branch 'award-custom-badge-type' into 'eip-develop'

Apply badge type to manually awardable badges

Closes #44

See merge request !79

app/controllers/badges_controller.rb

@@ -62,16 +62,16 @@ class BadgesController < ApplicationController
   end
 
   def award_save
+    permitted_parameters = params.require(:user_badge).permit(:badge_type, :badge_source_type,
+                                                              :badge_source_id, :user, :badge)
+    @user = User.find_by(id: permitted_parameters[:user])
+    @badge = Badge.find_by(id: permitted_parameters[:badge])
+    @user_badge = UserBadge.new(permitted_parameters.merge(user: @user, badge: @badge,
+                                                           badge_type: permitted_parameters[:badge_type]))
+
     @entity_types = badge_source_types
-    @user = User.find_by(id: params[:user_badge][:user])
-    @badge = Badge.find_by(id: params[:user_badge][:badge])
-    @user_badge = UserBadge.new(params.require(:user_badge).permit(:badge_type, :badge_source_type,
-                                                                   :badge_source_id)
-                                      .merge(user: @user, badge: @badge,
-                                             badge_type: params[:user_badge][:badge_type].to_i))
-
-    unless badge_source_types.include? @user_badge.badge_source_type
-      flash[:danger] = 'Post Type is invalid.'
+    unless @entity_types.include? @user_badge.badge_source_type
+      flash[:danger] = 'Entity Type is invalid.'
       redirect_to :award, status: :bad_request
       return
     end

app/views/badges/award.html.erb

@@ -21,7 +21,7 @@
 
   <div class="form-group">
     <%= f.label :badge_type, 'Type', class: 'form-element' %>
-    <%= f.select :badge_type, UserBadge.badge_types.keys,
+    <%= f.select :badge_type, options_for_select(UserBadge.badge_types.keys.to_a ),
                  { include_blank: false }, class: 'form-element' %>
   </div>