fix save modulgruppen
This commit is contained in:
@@ -44,14 +44,11 @@ class ModulsController < ApplicationController
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
def edit_lvas
|
def edit_lvas
|
||||||
|
@lvas = @modul.lvas
|
||||||
@lvas = @modul.lvas
|
|
||||||
@semester = @modul.modulgruppen.flatten.map(&:studium).map(&:semester).flatten.uniq
|
@semester = @modul.modulgruppen.flatten.map(&:studium).map(&:semester).flatten.uniq
|
||||||
|
|
||||||
end
|
end
|
||||||
def update_lvas
|
def update_lvas
|
||||||
|
|
||||||
|
|
||||||
@semester = @modul.modulgruppen.flatten.map(&:studium).map(&:semester).flatten.uniq
|
@semester = @modul.modulgruppen.flatten.map(&:studium).map(&:semester).flatten.uniq
|
||||||
@newlvas=Lva.update_multiple_with_modul(params["lvas"],@modul)
|
@newlvas=Lva.update_multiple_with_modul(params["lvas"],@modul)
|
||||||
@lvas=@newlvas
|
@lvas=@newlvas
|
||||||
|
|||||||
@@ -25,7 +25,9 @@ class Modulgruppe < ActiveRecord::Base
|
|||||||
validates :phase, :inclusion => {:in => [1, 2, 3, 4]}
|
validates :phase, :inclusion => {:in => [1, 2, 3, 4]}
|
||||||
validates :typ, :inclusion => {:in => ["Pflicht","Vertiefungspflicht","Wahl"] }
|
validates :typ, :inclusion => {:in => ["Pflicht","Vertiefungspflicht","Wahl"] }
|
||||||
translates :desc, :versioning =>true,:fallbacks_for_empty_translations => true
|
translates :desc, :versioning =>true,:fallbacks_for_empty_translations => true
|
||||||
|
def long_name
|
||||||
|
self.studium_name + ": "+ name
|
||||||
|
end
|
||||||
def studium_name
|
def studium_name
|
||||||
self.studium.nil? ? "Kein Studium vorhanden" : self.studium.name
|
self.studium.nil? ? "Kein Studium vorhanden" : self.studium.name
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<%= semantic_form_for @modul do |f| %>
|
<%= semantic_form_for @modul do |f| %>
|
||||||
|
|
||||||
<%= f.inputs do %>
|
<%= f.inputs do %>
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span9">
|
<div class="span9">
|
||||||
@@ -24,7 +23,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="span3">
|
<div class="span3">
|
||||||
<%= f.input :modulgruppen,:as => :check_boxes, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}.sort] %>
|
<%= f.input :modulgruppen, :as => :check_boxes, :member_label=>:long_name, :collection => Modulgruppe.all %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user