From a65f1a89263df0fd2634fe6165e6900a7a1cd210 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 14 Sep 2014 18:32:03 +0200 Subject: [PATCH] lva paper_trail fix --- Gemfile | 2 +- app/models/lva.rb | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 6250ceb..363e073 100755 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ gem "tinymce-rails" , '~>4.1.0' gem "globalize" ,'~>3.0.4'#,:git =>'git://github.com/globalize/globalize.git' gem 'globalize-versioning' # Version controll -gem "paper_trail" , '>=2.7.0', :git=>'git://github.com/airblade/paper_trail.git' +gem "paper_trail" , '~>3.0.5', :git=>'git://github.com/airblade/paper_trail.git' # User management gem "devise" ,'~>2.2.3' diff --git a/app/models/lva.rb b/app/models/lva.rb index dcd7e17..bc5bd2f 100755 --- a/app/models/lva.rb +++ b/app/models/lva.rb @@ -25,20 +25,19 @@ # id :integer not null, primary key # name :string(255) # desc :text -# ects :decimal(, ) +# ects :decimal # lvanr :string(255) -# stunden :decimal(, ) +# stunden :decimal # created_at :datetime not null # updated_at :datetime not null # modul_id :integer -# semester_id :integer - # +# semester_id :integer class Lva < ActiveRecord::Base ERLAUBTE_TYPEN = ['VO', 'UE', 'VU', 'LU', 'SE', 'andere']; - + translates :desc,:pruefungsinformation, :fallbacks_for_empty_translations => true, :versioning=> :paper_trail #true #{:gem=>:paper_trail} 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, :forumlink