From e7b573d58eb62dcf7be82efe2a9f896c5ed55b4c Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Tue, 13 Aug 2013 17:03:57 +0200
Subject: header view fixed

---
 app/views/gateway_headers/show.html.haml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/gateway_headers/show.html.haml b/app/views/gateway_headers/show.html.haml
index 4f1af49..83f9e30 100644
--- a/app/views/gateway_headers/show.html.haml
+++ b/app/views/gateway_headers/show.html.haml
@@ -1,17 +1,17 @@
 - content_for :title, t("gateway_headers.show.page_title")
 
 %p
-  %strong= t('gateway_headers.show.gateway') + ":"
-  = @gateway_header.gateway
+  %strong= t('gateway_headers.show.header_type') + ":"
+  = @gateway_header.header_type
+%p
+  %strong= t('gateway_headers.show.constraint_value') + ":"
+  = @gateway_header.constraint_value
 %p
   %strong= t('gateway_headers.show.name') + ":"
   = @gateway_header.name
 %p
   %strong= t('gateway_headers.show.value') + ":"
   = @gateway_header.value
-%p
-  %strong= t('gateway_headers.show.class_type') + ":"
-  = @gateway_header.class_type
 %p
   %strong= t('gateway_headers.show.description') + ":"
   = @gateway_header.description
-- 
cgit v1.2.3


From a688b1b98e7df2807d7ecec016f32083993edb4a Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Tue, 13 Aug 2013 17:05:02 +0200
Subject: translations

---
 config/locales/views/gateway_headers/de.yml | 7 ++++---
 config/locales/views/gateway_headers/en.yml | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/locales/views/gateway_headers/de.yml b/config/locales/views/gateway_headers/de.yml
index 3f3786c..5484865 100644
--- a/config/locales/views/gateway_headers/de.yml
+++ b/config/locales/views/gateway_headers/de.yml
@@ -22,10 +22,11 @@ de:
     show:
       page_title: 'Header bearbeiten'
       gateway: 'Gateway'
+      header_type: 'Typ'
+      constraint_value: 'Beschränkung'
       name: 'Name'
-      value: 'Value'
-      class_type: 'Class type'
-      description: 'Description'
+      value: 'Wert'
+      description: 'Beschreibung'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass die diesen Header löschen möchten?'
         destroy: 'Löschen'
diff --git a/config/locales/views/gateway_headers/en.yml b/config/locales/views/gateway_headers/en.yml
index 4fca18a..ab5899d 100644
--- a/config/locales/views/gateway_headers/en.yml
+++ b/config/locales/views/gateway_headers/en.yml
@@ -22,9 +22,10 @@ en:
     show:
       page_title: 'Show Header'
       gateway: 'Gateway'
+      header_type: 'Type'
+      constraint_value: 'Constraint'
       name: 'Name'
       value: 'Value'
-      class_type: 'Class type'
       description: 'Description'
       actions:
         confirm_destroy: 'Are you sure you want to delete this element?'
-- 
cgit v1.2.3


From 355252616286351aa6e8ccc50af35b1f88d44aa8 Mon Sep 17 00:00:00 2001
From: Sascha Daniels <sd@alternative-solution.de>
Date: Fri, 25 Oct 2013 13:26:30 +0200
Subject: Fixed shell vs. ruby ;-)

---
 lib/tasks/backup.rake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/backup.rake b/lib/tasks/backup.rake
index 0dbadad..c26bc62 100644
--- a/lib/tasks/backup.rake
+++ b/lib/tasks/backup.rake
@@ -7,13 +7,13 @@ namespace :backup do
   desc "Do a backup."
   task :queue_a_new_backup => :environment do
     backup_job = BackupJob.create
-    echo "BackupJob ID: #{backup_job.id}"
+    puts "BackupJob ID: #{backup_job.id}"
   end
 
   desc "Do a backup. Now!"
   task :force_now => :environment do
     backup_job = BackupJob.create(:state => 'force now')
-    echo "BackupJob ID: #{backup_job.id}"
+    puts "BackupJob ID: #{backup_job.id}"
   end
 
   desc "Restore the system"
@@ -83,4 +83,4 @@ namespace :backup do
     end
   end
 
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From a97e9e9854579a4f0f4455703ea9684c65aa9f3d Mon Sep 17 00:00:00 2001
From: Sascha Daniels <sd@alternative-solution.de>
Date: Sat, 26 Oct 2013 00:56:52 +0200
Subject: private not worling here

---
 app/models/backup_job.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/backup_job.rb b/app/models/backup_job.rb
index e2f2e6c..b06d0d1 100644
--- a/app/models/backup_job.rb
+++ b/app/models/backup_job.rb
@@ -10,7 +10,6 @@ class BackupJob < ActiveRecord::Base
     self.started_at.to_s
   end
 
-  private
   def set_state_to_queued
     self.state ||= 'queued'
     self.started_at = Time.now
-- 
cgit v1.2.3