startkladde · st-e · Jan 29, 2017 · Jan 29, 2017 · Jan 29, 2017 · Jan 29, 2017
diff --git a/Gemfile b/Gemfile
@@ -1,13 +1,14 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 3.0.20'
+gem 'rails', '~> 3.2.22.5'
 gem 'rake', '10.1.0'
+gem 'dynamic_form'
 gem 'prawn', '~> 0.8.4'
 gem 'prawn-layout', '0.8.4'
+gem 'prawnto'
 gem 'will_paginate', '~> 3.1.0'
 
 gem 'mysql2', '~> 0.3.16'
-gem 'activerecord-mysql2-adapter', '0.0.3'
 
 #group :production do
 #  gem 'fcgi'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,93 +1,108 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.20)
-      actionpack (= 3.0.20)
-      mail (~> 2.2.19)
-    actionpack (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activerecord-mysql2-adapter (0.0.3)
-      mysql2
-    activeresource (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-    activesupport (3.0.20)
-    arel (2.0.10)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.4)
-    json (1.8.1)
-    mail (2.2.20)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
+    actionmailer (3.2.22.5)
+      actionpack (= 3.2.22.5)
+      mail (~> 2.5.4)
+    actionpack (3.2.22.5)
+      activemodel (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.22.5)
+      activesupport (= 3.2.22.5)
+      builder (~> 3.0.0)
+    activerecord (3.2.22.5)
+      activemodel (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.22.5)
+      activemodel (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
+    activesupport (3.2.22.5)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    dynamic_form (1.1.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.7.0)
+    journey (1.0.4)
+    json (1.8.6)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
+    multi_json (1.12.1)
     mysql2 (0.3.16)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     prawn (0.8.4)
       prawn-core (>= 0.8.4, < 0.9)
       prawn-layout (>= 0.8.4, < 0.9)
       prawn-security (>= 0.8.4, < 0.9)
     prawn-core (0.8.4)
     prawn-layout (0.8.4)
     prawn-security (0.8.4)
-    rack (1.2.8)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    prawnto (0.1.1)
+      prawn
+      rails (>= 2.1)
+    rack (1.4.7)
+    rack-cache (1.7.0)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.0.20)
-      actionmailer (= 3.0.20)
-      actionpack (= 3.0.20)
-      activerecord (= 3.0.20)
-      activeresource (= 3.0.20)
-      activesupport (= 3.0.20)
+    rails (3.2.22.5)
+      actionmailer (= 3.2.22.5)
+      actionpack (= 3.2.22.5)
+      activerecord (= 3.2.22.5)
+      activeresource (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
       bundler (~> 1.0)
-      railties (= 3.0.20)
-    railties (3.0.20)
-      actionpack (= 3.0.20)
-      activesupport (= 3.0.20)
+      railties (= 3.2.22.5)
+    railties (3.2.22.5)
+      actionpack (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (>= 0.14.6, < 2.0)
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    thor (0.14.6)
+    sprockets (2.2.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.19.4)
+    tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
+    tzinfo (0.3.52)
     will_paginate (3.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord-mysql2-adapter (= 0.0.3)
+  dynamic_form
   mysql2 (~> 0.3.16)
   prawn (~> 0.8.4)
   prawn-layout (= 0.8.4)
-  rails (~> 3.0.20)
+  prawnto
+  rails (~> 3.2.22.5)
   rake (= 10.1.0)
   will_paginate (~> 3.1.0)
+
+BUNDLED WITH
+   1.14.3
diff --git a/app/models/person.rb b/app/models/person.rb
@@ -21,16 +21,16 @@ def medical_validity_valid_or_blank
 
     # Human names for attributes
     # .label of form_helper does not use this, but error_messages does
-    attr_human_name 'last_name'                  => 'Nachname'
-    attr_human_name :first_name                  => 'Vorname'
-    attr_human_name :club                        => 'Verein'
-    attr_human_name :medical_validity            => 'Medical gültig bis'
-    attr_human_name :medical_validity_text       => 'Medical gültig bis'
-    attr_human_name :check_medical_validity      => 'Medical prüfen'
-    attr_human_name :check_medical_validity_text => 'Medical prüfen'
-    attr_human_name :club_id                     => 'Vereins-ID'
-    attr_human_name :nickname                    => 'Verein'
-    attr_human_name 'comments'                   => 'Bemerkungen'
+    human_attribute_name 'last_name'                  => 'Nachname'
+    human_attribute_name :first_name                  => 'Vorname'
+    human_attribute_name :club                        => 'Verein'
+    human_attribute_name :medical_validity            => 'Medical gültig bis'
+    human_attribute_name :medical_validity_text       => 'Medical gültig bis'
+    human_attribute_name :check_medical_validity      => 'Medical prüfen'
+    human_attribute_name :check_medical_validity_text => 'Medical prüfen'
+    human_attribute_name :club_id                     => 'Vereins-ID'
+    human_attribute_name :nickname                    => 'Verein'
+    human_attribute_name 'comments'                   => 'Bemerkungen'
 
     # Callbacks
     # Prevent destruction of people that are in use.

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 class User < ActiveRecord::Base
-	set_primary_key "username"
+	self.primary_key = "username"
 
 	# Associations
 	belongs_to :person
@@ -28,9 +28,9 @@ class User < ActiveRecord::Base
 	validates_confirmation_of :password,                                     :message => "stimmt nicht mit Bestätigung überein"
 
 	# Human names for attributes
-	attr_human_name :username         => 'Benutzername'
-	attr_human_name :current_password => 'Altes Passwort'
-	attr_human_name :password         => 'Passwort'
+	human_attribute_name :username         => 'Benutzername'
+	human_attribute_name :current_password => 'Altes Passwort'
+	human_attribute_name :password         => 'Passwort'
 
 	# Callbacks
 	# If a password confirmation is given, a password is also given and must be

diff --git a/app/views/debug/dump_environment.html.erb b/app/views/debug/dump_environment.html.erb
@@ -7,7 +7,7 @@
 	</style>
 <% end %>
 
-<% page_title "Environment dumper" do %>
+<%= page_title "Environment dumper" do %>
 	<% heading "Location" do %>
 		<p><%= h s.username||"?" %>@<%= h s.hostname||"?" %>:<%= h Dir.pwd %></p>
 	<% end %>

diff --git a/app/views/debug/redirect.html.erb b/app/views/debug/redirect.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Weiterleitung" do %>
+<%= page_title "Weiterleitung" do %>
 
 <p>
 	Weiterleitung zu <%= link_to @target_url, @target_url %> mit Status <%= @status.inspect %>

diff --git a/app/views/people/edit.html.erb b/app/views/people/edit.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Person #{h @person.full_name} editieren" do %>
+<%= page_title "Person #{h @person.full_name} editieren" do %>
 
 	<%= form_for(@person) do |f| %>
 		<%# TODO code duplication %>

diff --git a/app/views/people/export_select.html.erb b/app/views/people/export_select.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Personen exportieren" do %>
+<%= page_title "Personen exportieren" do %>
 
     <%= form_tag 'export' do %>
         <table class="form">

diff --git a/app/views/people/import_errors.html.erb b/app/views/people/import_errors.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Personen importieren - Fehler" do %>
+<%= page_title "Personen importieren - Fehler" do %>
 
 	<%
 		single_person_errors=@errors.select { |error| error[:entries].size==1 }

diff --git a/app/views/people/import_review.html.erb b/app/views/people/import_review.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Personen importieren" do %>
+<%= page_title "Personen importieren" do %>
 
 	<%
 		new_people_entries       =@import_data.entries.select { |entry| entry.new? }

diff --git a/app/views/people/import_select.html.erb b/app/views/people/import_select.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Personen importieren" do %>
+<%= page_title "Personen importieren" do %>
 
 	<%= form_tag 'import', :multipart => true do %>
 		<table class="form">

diff --git a/app/views/people/new.html.erb b/app/views/people/new.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Person anlegen" do %>
+<%= page_title "Person anlegen" do %>
 
 	<%= form_for(@person) do |f| %>
 		<%= f.error_messages \

diff --git a/app/views/people/overwrite_confirm.html.erb b/app/views/people/overwrite_confirm.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Person #{h @wrong_person.full_name} überschreiben" do %>
+<%= page_title "Person #{h @wrong_person.full_name} überschreiben" do %>
 
 	<% heading h "Falsche Person" do %>
 

diff --git a/app/views/people/show.html.erb b/app/views/people/show.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Person: #{h @person.full_name}" do %>
+<%= page_title "Person: #{h @person.full_name}" do %>
 
 	<% user=@person.user %>
 

diff --git a/app/views/pilot_log/index.html.erb b/app/views/pilot_log/index.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Flugbuch für #{h @person.full_name}" do %>
+<%= page_title "Flugbuch für #{h @person.full_name}" do %>
 
 	<%= form_tag do %>
 		<table class="form">

diff --git a/app/views/users/change_password.html.erb b/app/views/users/change_password.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Passwort für Benutzer #{h @user.username} ändern" do %>
+<%= page_title "Passwort für Benutzer #{h @user.username} ändern" do %>
 
 	<% @user.clear_passwords %>
 	<%= form_for(@user, :url => { :action => params[:action] }, :html=>{:method=>:post}) do |f| %>

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
@@ -1,4 +1,4 @@
-<% page_title "Benutzer anlegen" do %>
+<%= page_title "Benutzer anlegen" do %>
 
     <% @user.clear_passwords %>
     <%= form_for(@user) do |f| %>

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -11,7 +11,7 @@
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
+  #config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -22,5 +22,12 @@
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
 end
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -32,4 +32,7 @@
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
 end
diff --git a/config/initializers/fix_relative_url_root.rb → ...initializers/fix_relative_url_root.rb.bak b/config/initializers/fix_relative_url_root.rb → ...initializers/fix_relative_url_root.rb.bak
diff --git a/vendor/plugins/human_attribute_override/README b/vendor/plugins/human_attribute_override/README