diff --git a/app/controllers/beispiele_controller.rb b/app/controllers/beispiele_controller.rb index 7f117ce..d0a8146 100755 --- a/app/controllers/beispiele_controller.rb +++ b/app/controllers/beispiele_controller.rb @@ -25,7 +25,7 @@ class BeispieleController < ApplicationController # GET /beispiele/new.json def new @beispiel = Beispiel.new - + @beispiel.lva_id = params[:lva_id] respond_to do |format| format.html # new.html.erb format.json { render json: @beispiel } diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb index 28d7172..f9409be 100755 --- a/app/controllers/lvas_controller.rb +++ b/app/controllers/lvas_controller.rb @@ -11,14 +11,15 @@ class LvasController < ApplicationController def show @lva = Lva.find_by_id(params[:id]) @toolbar_elements<<{:icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)} + @toolbar_elements<<{:icon=>:plus, :text => "Neues Beispiel", :path=> new_beispiel_path(:lva_id =>@lva.id)} end # GET /lvas/new # GET /lvas/new.json def new @lva = Lva.new - modul=Modul.find(params[:modul_id]) - @lva.modul< true + validates :name, :presence => true + validates :lva_id, :presence => true + validates :lva, :presence => true + end diff --git a/app/views/beispiele/_form.html.erb b/app/views/beispiele/_form.html.erb index dca1eb9..bf0c027 100755 --- a/app/views/beispiele/_form.html.erb +++ b/app/views/beispiele/_form.html.erb @@ -4,7 +4,7 @@ <%= f.input :desc %> <%= f.file_field :beispieldatei %> <%= f.hidden_field :beispieldatei_cache %> - <%= f.input :lva, :as=>:radio, :collection => Lva.all%> + <%= f.input :lva, :as=>:select, :collection => Lva.all%> <% end %> <%= f.actions do %>