bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Fre Jun 26 16:03:06 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-06-26 16:03:06 +02:00
parent 2ca5f49436
commit f5cc774c92
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/lecturer.rb
View File

@@ -14,6 +14,7 @@
class Lecturer < ActiveRecord::Base class Lecturer < ActiveRecord::Base
attr_accessible :email, :name, :oid, :picture, :remove_picture, :picture_cache, :lva_ids, :link attr_accessible :email, :name, :oid, :picture, :remove_picture, :picture_cache, :lva_ids, :link
has_and_belongs_to_many :lvas has_and_belongs_to_many :lvas
has_many :beispiele
mount_uploader :picture, PictureUploader mount_uploader :picture, PictureUploader
resourcify resourcify

3
app/models/lva.rb
View File

@@ -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 :modul,:uniq=>true # Gehört zu einem Modul
has_and_belongs_to_many :semester has_and_belongs_to_many :semester
has_many :beispiele , :class_name => "Beispiel" has_many :beispiele , :class_name => "Beispiel"
has_and_belongs_to_many :lecturers has_and_belongs_to_many :lecturers
has_many :nlinks, as: :link has_many :nlinks, as: :link
has_many :crawlobjects, :as=>:something has_many :crawlobjects, :as=>:something
@@ -56,7 +57,7 @@ class Lva < ActiveRecord::Base
validates_presence_of :stunden # Stunden Eingetragen? validates_presence_of :stunden # Stunden Eingetragen?
validates_presence_of :modul # Zugehöriges Modul eingetragen? validates_presence_of :modul # Zugehöriges Modul eingetragen?
# (zumindest eines) # (zumindest eines)
def typ_n def typ_n
typ=="andere" ? "" : typ typ=="andere" ? "" : typ
end end

4
config/environments/development.rb
View File

@@ -15,8 +15,8 @@ Fetsite::Application.configure do
# Don't care if the mailer can't send # Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = true config.action_mailer.raise_delivery_errors = true
config.action_mailer.delivery_method =:sendmail config.action_mailer.delivery_method =:sendmail
config.action_mailer.default_url_options = {} # :host => 'glonass.htu.tuwien.ac.at' } config.action_mailer.default_url_options = {} # :host => 'glonass.htu.tuwien.ac.at' }
# Print deprecation notices to the Rails logger # Print deprecation notices to the Rails logger
config.active_support.deprecation = :log config.active_support.deprecation = :log