From: Marcin Haba <marcin.haba@bacula.pl>
Date: Thu, 25 Jul 2019 19:46:08 +0000 (+0200)
Subject: baculum: On restore wizard job list add link to job history for specific jobid
X-Git-Tag: Release-9.6.0~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cca8f8f9e443805a9da815e7e7b0ba40887f0082;p=thirdparty%2Fbacula.git

baculum: On restore wizard job list add link to job history for specific jobid
---

diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo
index 73e95acad5..b1878a3061 100644
Binary files a/gui/baculum/protected/Web/Lang/en/messages.mo and b/gui/baculum/protected/Web/Lang/en/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/en/messages.po b/gui/baculum/protected/Web/Lang/en/messages.po
index 22335d9213..0a85e88947 100644
--- a/gui/baculum/protected/Web/Lang/en/messages.po
+++ b/gui/baculum/protected/Web/Lang/en/messages.po
@@ -2221,3 +2221,6 @@ msgstr "Add directive"
 
 msgid "Go to job with jobid %jobid"
 msgstr "Go to job with jobid %jobid"
+
+msgid "Go to job %job"
+msgstr "Go to job %job"
diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo
index dc9329cb59..ee5c26e500 100644
Binary files a/gui/baculum/protected/Web/Lang/ja/messages.mo and b/gui/baculum/protected/Web/Lang/ja/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/ja/messages.po b/gui/baculum/protected/Web/Lang/ja/messages.po
index 54540d955f..0bf2f2120f 100644
--- a/gui/baculum/protected/Web/Lang/ja/messages.po
+++ b/gui/baculum/protected/Web/Lang/ja/messages.po
@@ -2307,3 +2307,6 @@ msgstr "Add directive"
 
 msgid "Go to job with jobid %jobid"
 msgstr "Go to job with jobid %jobid"
+
+msgid "Go to job %job"
+msgstr "Go to job %job"
diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo
index 1b17683d12..8c3c23b8a2 100644
Binary files a/gui/baculum/protected/Web/Lang/pl/messages.mo and b/gui/baculum/protected/Web/Lang/pl/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/pl/messages.po b/gui/baculum/protected/Web/Lang/pl/messages.po
index 12ff1d2ae2..338a5d9306 100644
--- a/gui/baculum/protected/Web/Lang/pl/messages.po
+++ b/gui/baculum/protected/Web/Lang/pl/messages.po
@@ -2228,3 +2228,6 @@ msgstr "Dodaj dyrektywę"
 
 msgid "Go to job with jobid %jobid"
 msgstr "Przejdź do zadania z jobid %jobid"
+
+msgid "Go to job %job"
+msgstr "Przejdź do zadania %job"
diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo
index e3be77851f..d9b0e1719d 100644
Binary files a/gui/baculum/protected/Web/Lang/pt/messages.mo and b/gui/baculum/protected/Web/Lang/pt/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/pt/messages.po b/gui/baculum/protected/Web/Lang/pt/messages.po
index 91bd462e29..fb06dc2f2e 100644
--- a/gui/baculum/protected/Web/Lang/pt/messages.po
+++ b/gui/baculum/protected/Web/Lang/pt/messages.po
@@ -2236,3 +2236,6 @@ msgstr "Add directive"
 
 msgid "Go to job with jobid %jobid"
 msgstr "Go to job with jobid %jobid"
+
+msgid "Go to job %job"
+msgstr "Go to job %job"
diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.page b/gui/baculum/protected/Web/Pages/RestoreWizard.page
index cc95f7d28d..37d09bc762 100644
--- a/gui/baculum/protected/Web/Pages/RestoreWizard.page
+++ b/gui/baculum/protected/Web/Pages/RestoreWizard.page
@@ -195,7 +195,16 @@ var oJobsToRestoreList = {
 				},
 				{
 					data: 'jobid',
-					responsivePriority: 1
+					responsivePriority: 1,
+					render: function(data, type, row) {
+						var i = document.createElement('I');
+						i.className = 'fa fa-external-link-alt fa-xs';
+						var a = document.createElement('A');
+						a.href = '/web/job/history/' + data + '/';
+						a.appendChild(i);
+						a.title = '<%[ Go to job with jobid %jobid ]%>'.replace('%jobid', data);
+						return (data + ' ' + a.outerHTML);
+					}
 				},
 				{
 					data: 'name',
@@ -204,9 +213,9 @@ var oJobsToRestoreList = {
 						var i = document.createElement('I');
 						i.className = 'fa fa-external-link-alt fa-xs';
 						var a = document.createElement('A');
-						a.href = '/web/job/history/' + row.jobid + '/';
+						a.href = '/web/job/' + encodeURIComponent(data) + '/';
 						a.appendChild(i);
-						a.title = '<%[ Go to job with jobid %jobid ]%>'.replace('%jobid', row.jobid);
+						a.title = '<%[ Go to job %job ]%>'.replace('%job', data);
 						return (data + ' ' + a.outerHTML);
 					}
 				},