Freezer dashboard enhancements

added search filter for job list
added 2 new compression algorithms options (xz, bzip2)

Change-Id: Id179622b235b3ca502d30d211bc2a62eda2f5e53
This commit is contained in:
memo 2015-10-07 15:39:05 +01:00
parent 18a5c4c38b
commit 94f9c2d7f4
2 changed files with 17 additions and 8 deletions

View File

@ -148,6 +148,11 @@ class CreateAction(tables.LinkAction):
kwargs={'job_id': datum.job_id})
class ObjectFilterAction(tables.FilterAction):
def allowed(self, request, datum):
return bool(self.table.kwargs['job_id'])
class JobsTable(tables.DataTable):
job_name = tables.Column("description",
link=get_backup_configs_link,
@ -162,7 +167,8 @@ class JobsTable(tables.DataTable):
class Meta(object):
name = "jobs"
verbose_name = _("Jobs")
table_actions = (CreateJob,
table_actions = (ObjectFilterAction,
CreateJob,
DeleteMultipleJobs)
footer = False
multi_select = True
@ -218,11 +224,6 @@ class EditAction(tables.LinkAction):
kwargs={'job_id': ids})
class ObjectFilterAction(tables.FilterAction):
def allowed(self, request, datum):
return bool(self.table.kwargs['job_id'])
class ActionsTable(tables.DataTable):
action_name = tables.Column('action',
verbose_name=_("Action Type"))

View File

@ -241,7 +241,11 @@ class ActionConfiguration(workflows.Step):
'remove_older_than',
'remove_from_date',
'original_name',
'action_id')
'action_id',
'storage',
'ssh_host',
'ssh_username',
'ssh_key')
class SnapshotConfigurationAction(workflows.Action):
@ -385,7 +389,11 @@ class AdvancedConfigurationAction(workflows.Action):
required=False)
compression = forms.ChoiceField(
choices=[('gzip', _("Minimum Compression (GZip/Zip/Zlib)"))],
choices=[
('gzip', _("Minimum Compression (GZip/Zip/Zlib)")),
('bzip2', _("More Effective Compression (Bzip2)")),
('xz', _("Lossless Data Compression (XZ)"))
],
help_text="",
label=_('Compression Level'),
required=False)