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

Merge remote-tracking branch 'thomasb/master'

Browse Source 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
This commit is contained in:
Andreas Stephanides
2013-08-12 11:11:59 +02:00
parent a02a99b307 0736320be6
commit 4aca98c0f5
44 changed files with 791 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/beispiele_controller.rb
View File

@@ -2,7 +2,6 @@ class BeispieleController < ApplicationController
# GET /beispiele
# GET /beispiele.json
def index
@lva = params([:lva])
@beispiele = Beispiel.all
respond_to do |format|
@@ -14,7 +13,7 @@ class BeispieleController < ApplicationController
# GET /beispiele/1
# GET /beispiele/1.json
def show
@lva = lva unless lva.nil?
# @lva = params([:lva]) unless params([:lva]).nil?
@beispiel = Beispiel.find(params[:id])
respond_to do |format|
@@ -46,6 +45,7 @@ class BeispieleController < ApplicationController
lvaid=params[:lva_id]
params.delete(:lva_id)
@beispiel = Beispiel.new(params[:beispiel])
respond_to do |format|
if @beispiel.save
format.html { redirect_to @beispiel, notice: 'Beispiel was successfully created.' }