diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-26 10:48:26 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-26 10:48:26 +0100 |
commit | b144a7885610d605447c80f659643524a839db0c (patch) | |
tree | 0ba02970c4ce7a30d2859b01d9121fbf04cd5c75 /app/models | |
parent | 0442cd19bc9383669b506185356227361a16e442 (diff) | |
parent | ffaa80e8d46b3b6b7597af6f157724005f48bae4 (diff) |
Merge branch 'restore' into develop
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/ability.rb | 1 | ||||
-rw-r--r-- | app/models/restore_job.rb | 13 |
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 |