Merge branch 'develop' of github.com:amooma/GS5 into develop

2 files changed, 7 insertions, 22 deletions

diff --git a/app/models/fax_document.rb b/app/models/fax_document.rb
index be689e2..16fdc70 100644
--- a/app/models/fax_document.rb
+++ b/app/models/fax_document.rb
@@ -48,10 +48,6 @@ class FaxDocument < ActiveRecord::Base
     end  
   end
   
-  def to_s
-    name
-  end
-  
   def render_thumbnails
     directory = "/tmp/GS-#{GsParameter.get('GEMEINSCHAFT_VERSION')}/fax_thumbnails/#{self.id}"
     system('mkdir -p ' + directory)
diff --git a/config/schedule.rb b/config/schedule.rb
index 0b5f0ca..94603f1 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -1,24 +1,13 @@
-# Use this file to easily define all of your cron jobs.
+# Daily Backup
 #
-# It's helpful, but not entirely necessary to understand cron before proceeding.
-# http://en.wikipedia.org/wiki/Cron
-
-# Example:
-#
-# set :output, "/path/to/my/cron_log.log"
-#
-# every 2.hours do
-#   command "/usr/bin/some_great_command"
-#   runner "MyModel.some_method"
-#   rake "some:great:rake:task"
-# end
-#
-# every 4.days do
-#   runner "AnotherModel.prune_old_records"
-# end
-
 every 1.day, :at => '4:00 am' do
   rake "backup:daily_backup"
 end
 
+# Auto-Reboot of Phones which should be rebootet
+#
+every 1.day, :at => '2:30 am' do
+  command "/opt/GS5/script/logout_phones.sh"
+end
+
 # Learn more: http://github.com/javan/whenever