Merge branch 'master' into youtube-requests

2018-03-05 22:47:44 -08:00 · 2018-03-05 22:47:44 -08:00 · 9bb9d954b3
commit 9bb9d954b3
parent 4bcb93ae7b 913210347f
1 changed files with 3 additions and 1 deletions
--- a/app/controllers/admin/commercials_controller.rb
+++ b/app/controllers/admin/commercials_controller.rb
@ -57,7 +57,9 @@ module Admin
    def mass_upload
      errors = Commercial.read_file(params[:file]) if params[:file]

-      if errors.all? { |_k, v| v.blank? }
+      if !params[:file]
+        flash[:error] = 'Empty file detected while adding commercials to Event'
+      elsif errors.all? { |_k, v| v.blank? }
        flash[:notice] = 'Successfully added commercials.'
      else
        errors_text = ''