From a9cfc39baeb540327600b7b12d267e6145321288 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 7 Apr 2014 10:07:41 +0200 Subject: [PATCH] =?UTF-8?q?lvas=20bei=20modulgruppen=20und=20studium=20hin?= =?UTF-8?q?zugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/modulgruppe.rb | 2 +- app/models/studium.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/modulgruppe.rb b/app/models/modulgruppe.rb index 003a451..7e45fd7 100755 --- a/app/models/modulgruppe.rb +++ b/app/models/modulgruppe.rb @@ -16,7 +16,7 @@ class Modulgruppe < ActiveRecord::Base attr_accessible :name, :phase, :typ,:desc, :studium_id, :modul_ids belongs_to :studium, :foreign_key => "studium_id" has_and_belongs_to_many :moduls - + has_many :lvas, :through=>:moduls resourcify validates :studium_id, :presence => true # Bei der Abfrage ist student_id entscheidend diff --git a/app/models/studium.rb b/app/models/studium.rb index a869d37..51afdf1 100755 --- a/app/models/studium.rb +++ b/app/models/studium.rb @@ -30,7 +30,8 @@ class Studium < ActiveRecord::Base attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester, :picture, :picture_cache, :qualifikation,:struktur, :jobmoeglichkeiten has_many :modulgruppen, inverse_of: :studium, :class_name => "Modulgruppe", :dependent => :destroy scope :search, ->(query) {where("name like ? or studien.desc like ?", "%#{query}%", "%#{query}%")} - + has_many :moduls, :through=>:modulgruppen + has_many :lvas, :through=>:moduls has_many :semester, :dependent => :destroy validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/} validates :typ, :inclusion => {:in => ["Bachelor","Master"] }