[checkmk-commits] 5050 FIX Fixed error "You need to specify a backup job." when restoring a backup

Module: check_mk Branch: master Commit: b1c021fe4ee31fd07426ae14bf9f3d9baa6fca32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1c021fe4ee31f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 2 16:11:36 2017 +0200 5050 FIX Fixed error "You need to specify a backup job." when restoring a backup Change-Id: I7b7cccda4e84c1f8d85206f49ffe6bcf30865ad6 --- .werks/5050 | 11 +++++++++++ web/htdocs/backup.py | 36 +++++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/.werks/5050 b/.werks/5050 new file mode 100644 index 0000000..1208f3b --- /dev/null +++ b/.werks/5050 @@ -0,0 +1,11 @@ +Title: Fixed error "You need to specify a backup job." when restoring a backup +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1501683066 + + diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index 159fc72..3bac667 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -840,19 +840,10 @@ class PageEditBackupJob(object): -class PageBackupJobState(object): +class PageAbstractBackupJobState(object): def __init__(self): - super(PageBackupJobState, self).__init__() - job_ident = html.var("job") - if job_ident != None: - try: - self._job = self.jobs().get(job_ident) - except KeyError: - raise MKUserError("job", _("This backup job does not exist.")) - - self._ident = job_ident - else: - raise MKUserError("job", _("You need to specify a backup job.")) + super(PageAbstractBackupJobState, self).__init__() + self._ident = None def jobs(self): @@ -927,6 +918,25 @@ class PageBackupJobState(object): html.close_table() +class PageBackupJobState(PageAbstractBackupJobState): + def __init__(self): + super(PageBackupJobState, self).__init__() + self._from_vars() + + + def _from_vars(self): + job_ident = html.var("job") + if job_ident != None: + try: + self._job = self.jobs().get(job_ident) + except KeyError: + raise MKUserError("job", _("This backup job does not exist.")) + + self._ident = job_ident + else: + raise MKUserError("job", _("You need to specify a backup job.")) + + #. # .--Targets-------------------------------------------------------------. # | _____ _ | @@ -1830,7 +1840,7 @@ class PageBackupRestore(object): -class PageBackupRestoreState(PageBackupJobState): +class PageBackupRestoreState(PageAbstractBackupJobState): def __init__(self): super(PageBackupRestoreState, self).__init__() self._job = RestoreJob(None, None) # TODO: target_ident and backup_ident needed?