Merge branches 'develop' and 'develop' of https://github.com/amooma/GS5 into develop

2 files changed, 14 insertions, 0 deletions

diff --git a/app/models/ability.rb b/app/models/ability.rb
index d886d53..690ee76 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -176,6 +176,7 @@ class Ability
         #
         can :create, GemeinschaftSetup
         can :manage, SipDomain
+        can [:create, :new, :show, :index], RestoreJob
       end
     end
 
diff --git a/app/models/restore_job.rb b/app/models/restore_job.rb
new file mode 100644
index 0000000..2c2da54
--- /dev/null
+++ b/app/models/restore_job.rb
@@ -0,0 +1,13 @@
+class RestoreJob < ActiveRecord::Base
+  attr_accessible :state, :backup_file
+
+  mount_uploader :backup_file, BackupFileUploader
+
+  def to_s
+    if self.backup_file?
+       File.basename(self.backup_file.to_s)
+    else
+      "RestoreJob ID #{self.id}"
+    end
+  end  
+end