Merge pull request #82 from kodgemisi/development

moves activity creation bugfix into master
kodgemisi · Feb 26, 2015 · e5cd609 · e5cd609
2 parents 895e27b + b49144a
commit e5cd609
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
@@ -85,9 +85,9 @@ def apply
   def save_apply
     @speech = Speech.new(speech_params)
     @speech.conference = @conference
-    create_activity!(nil, @conference, @speech, "speech_new")
     respond_to do |format|
       if @speech.save
+        create_activity!(nil, @conference, @speech, "speech_new")
         format.html { redirect_to apply_conference_path, notice: t("application_received", topic: @speech.topic.subject) }
       else
         format.html { render action: "apply" }