diff --git a/app/models/lva.rb b/app/models/lva.rb index 4c80b04..dcd7e17 100755 --- a/app/models/lva.rb +++ b/app/models/lva.rb @@ -40,7 +40,7 @@ class Lva < ActiveRecord::Base has_paper_trail :ignore=>[:desc, :pruefungsinformation]# Versionsverfolgung translates :desc,:pruefungsinformation, :fallbacks_for_empty_translations => true, :versioning=>true - attr_accessible :desc, :ects, :lvanr, :name, :stunden, :modul_ids, :semester_ids, :pruefungsinformation, :lernaufwand, :typ, :lecturer_ids + attr_accessible :desc, :ects, :lvanr, :name, :stunden, :modul_ids, :semester_ids, :pruefungsinformation, :lernaufwand, :typ, :lecturer_ids, :forumlink has_and_belongs_to_many :modul,:uniq=>true # Gehört zu einem Modul has_and_belongs_to_many :semester diff --git a/app/models/thema.rb b/app/models/thema.rb index 5d98ce0..2bfdeaf 100644 --- a/app/models/thema.rb +++ b/app/models/thema.rb @@ -23,10 +23,11 @@ include Rails.application.routes.url_helpers validates :text, :presence => true scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")} - scope :outdated, -> {where("updated_at < ?", 2.month.ago)} + scope :outdated, -> {includes(:translations).where("thema_translations.updated_atI18n.t.locale) +} translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true def is_outdated? - updated_at < 1.month.ago + translation.updated_at < 2.month.ago end def is_wiki? !(wikiname.nil? || wikiname.empty?) diff --git a/app/views/lvas/_form.html.erb b/app/views/lvas/_form.html.erb index fce1d78..3aee19d 100755 --- a/app/views/lvas/_form.html.erb +++ b/app/views/lvas/_form.html.erb @@ -20,15 +20,20 @@ <%= f.input :ects, :wrapper_html=>{:class=>'span4'} %> <%= f.input :stunden, :wrapper_html=>{:class=>'span4'} %> + +
+ <%= f.input :forumlink, :wrapper_html=>{:class=>'span12'}%> +
- <%= f.input :desc , :as=>:tinymce_text %> - <%= f.input :pruefungsinformation %> - <%= f.input :lernaufwand %> -
+ <%= f.input :desc , :as=>:tinymce_text %> + <%= f.input :pruefungsinformation %> + <%= f.input :lernaufwand %> + +
diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index a7b8818..8d36956 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -4,7 +4,10 @@

<%= @lva.full_name %>

- + +

Prüfungsinformation

<%= @lva.pruefungsinformation.to_s.html_safe %> diff --git a/db/migrate/20140709173026_add_forum_link_to_lvas.rb b/db/migrate/20140709173026_add_forum_link_to_lvas.rb new file mode 100644 index 0000000..9cec24f --- /dev/null +++ b/db/migrate/20140709173026_add_forum_link_to_lvas.rb @@ -0,0 +1,5 @@ +class AddForumLinkToLvas < ActiveRecord::Migration + def change + add_column :lvas, :forumlink, :string + end +end