From f5cc774c925fd4113ac49c93790f035b15239671 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Fri, 26 Jun 2015 16:03:06 +0200 Subject: [PATCH] AutoCommit Fre Jun 26 16:03:06 CEST 2015 --- app/models/lecturer.rb | 1 + app/models/lva.rb | 3 ++- config/environments/development.rb | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/lecturer.rb b/app/models/lecturer.rb index 8195633..027f47b 100644 --- a/app/models/lecturer.rb +++ b/app/models/lecturer.rb @@ -14,6 +14,7 @@ class Lecturer < ActiveRecord::Base attr_accessible :email, :name, :oid, :picture, :remove_picture, :picture_cache, :lva_ids, :link has_and_belongs_to_many :lvas + has_many :beispiele mount_uploader :picture, PictureUploader resourcify diff --git a/app/models/lva.rb b/app/models/lva.rb index 6de47d1..1927fa0 100755 --- a/app/models/lva.rb +++ b/app/models/lva.rb @@ -44,6 +44,7 @@ class Lva < ActiveRecord::Base has_and_belongs_to_many :modul,:uniq=>true # Gehört zu einem Modul has_and_belongs_to_many :semester has_many :beispiele , :class_name => "Beispiel" + has_and_belongs_to_many :lecturers has_many :nlinks, as: :link has_many :crawlobjects, :as=>:something @@ -56,7 +57,7 @@ class Lva < ActiveRecord::Base validates_presence_of :stunden # Stunden Eingetragen? validates_presence_of :modul # Zugehöriges Modul eingetragen? # (zumindest eines) - + def typ_n typ=="andere" ? "" : typ end diff --git a/config/environments/development.rb b/config/environments/development.rb index 63ff982..53fb4c2 100755 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -15,8 +15,8 @@ Fetsite::Application.configure do # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = true - config.action_mailer.delivery_method =:sendmail - config.action_mailer.default_url_options = {} # :host => 'glonass.htu.tuwien.ac.at' } + config.action_mailer.delivery_method =:sendmail + config.action_mailer.default_url_options = {} # :host => 'glonass.htu.tuwien.ac.at' } # Print deprecation notices to the Rails logger config.active_support.deprecation = :log