andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/HausdorffHimself/fetsite

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-20 13:58:20 +02:00
parent d96a694a73 65b0ad8c19
commit 0a910386d7
13 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/fragen_controller.rb
View File

@@ -27,7 +27,7 @@ class FragenController < ApplicationController
@frage = Frage.new
respond_to do |format|
format.html # new.html.erb
format.html
format.json { render json: @frage }
end
end
@@ -44,7 +44,7 @@ class FragenController < ApplicationController
respond_to do |format|
if @frage.save
format.html { redirect_to @frage, notice: 'Frage was successfully created.' }
format.html { redirect_to @frage.thema, notice: 'Frage was successfully created.' }
format.json { render json: @frage, status: :created, location: @frage }
else
format.html { render action: "new" }
@@ -76,7 +76,7 @@ class FragenController < ApplicationController
@frage.destroy
respond_to do |format|
format.html { redirect_to fragen_url }
format.html { redirect_to @frage.thema }
format.json { head :no_content }
end
end