andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

studium nlink added

Browse Source
This commit is contained in:
Andreas Stephanides
2014-04-05 12:46:32 +02:00
parent b73f456f45
commit 4c9a3c8999
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/neuigkeit.rb
View File

@@ -28,7 +28,7 @@ class Neuigkeit < ActiveRecord::Base
scope :unpublished, -> {where("datum >= ? OR datum IS NULL", Date.today)} scope :unpublished, -> {where("datum >= ? OR datum IS NULL", Date.today)}
scope :public, ->{includes(:rubrik).where("rubriken.public"=>:true)} scope :public, ->{includes(:rubrik).where("rubriken.public"=>:true)}
scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")} scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")}
LINKTYPES=["Thema", "Gallery", "Lva"] LINKTYPES=["Thema", "Gallery", "Lva","Studium"]
accepts_nested_attributes_for :calentries, :allow_destroy=>true , :reject_if=> lambda{|a| a[:start].blank?} accepts_nested_attributes_for :calentries, :allow_destroy=>true , :reject_if=> lambda{|a| a[:start].blank?}
before_validation :sanitize before_validation :sanitize
has_many :nlinks has_many :nlinks

2
app/models/nlink.rb
View File

@@ -4,7 +4,7 @@ class Nlink < ActiveRecord::Base
belongs_to :link, :polymorphic=>true belongs_to :link, :polymorphic=>true
validates :neuigkeit, :presence=>true validates :neuigkeit, :presence=>true
validates :link, :presence=>true validates :link, :presence=>true
validates :link_id, :uniqueness=>{:scope=>[:neuigkeit_id]} validates :link_id, :uniqueness=>{:scope=>[:neuigkeit_id]}
end end

5
app/models/studium.rb
View File

@@ -29,6 +29,7 @@
class Studium < ActiveRecord::Base class Studium < ActiveRecord::Base
attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester, :picture, :picture_cache, :qualifikation,:struktur, :jobmoeglichkeiten 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 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 :semester, :dependent => :destroy has_many :semester, :dependent => :destroy
validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/} validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/}
@@ -40,7 +41,11 @@ class Studium < ActiveRecord::Base
def title_context def title_context
return self.abkuerzung.to_s.strip.empty? ? self.name : self.abkuerzung return self.abkuerzung.to_s.strip.empty? ? self.name : self.abkuerzung
end end
has_many :nlinks, as: :link
def title
self.name
end
def batch_add_semester def batch_add_semester
# Semester automatisch zu Studien hinzufügen # Semester automatisch zu Studien hinzufügen
if self.typ == "Bachelor" if self.typ == "Bachelor"