[prev in list] [next in list] [prev in thread] [next in thread]
List: bacula-commits
Subject: [Bacula-commits] [bacula.org] Bacula Community source branch Branch-5.2 updated. c4c7450f4f6691db2cc
From: git () bacula ! org
Date: 2013-02-19 14:30:51
Message-ID: 20130219143052.0C93339C01B () bacula ! bacula ! org
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula Community source".
The branch, Branch-5.2 has been updated
via c4c7450f4f6691db2ccb8f251e59ad8d25b780a7 (commit)
via f9b6a2e816e2c27e3670b1f9fba284b7ff4750ab (commit)
via ba77d53d903da4e4826813fde04af0a7f70d4628 (commit)
via 30547883d8e4eb4c70b5cae77427e811a635232f (commit)
from e31daaaca7b7a2f16b6bb0af040f6bf74c1639f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c4c7450f4f6691db2ccb8f251e59ad8d25b780a7
Author: Eric Bollengier <eric@baculasystems.com>
Date: Tue Feb 19 15:17:38 2013 +0100
bweb: Fix #1914 about broken link in Client - Current Jobs
commit f9b6a2e816e2c27e3670b1f9fba284b7ff4750ab
Author: Eric Bollengier <eric@baculasystems.com>
Date: Tue Feb 19 14:59:14 2013 +0100
Tweak last patch
commit ba77d53d903da4e4826813fde04af0a7f70d4628
Author: Eric Bollengier <eric@baculasystems.com>
Date: Tue Feb 19 14:53:47 2013 +0100
bweb: Fix #1915 about bad SQL in View Jobs
commit 30547883d8e4eb4c70b5cae77427e811a635232f
Author: Kern Sibbald <kern@sibbald.com>
Date: Tue Feb 19 07:35:03 2013 +0100
Add timer to run_multiple
-----------------------------------------------------------------------
Summary of changes:
diff --git a/gui/bweb/cgi/bresto.pl b/gui/bweb/cgi/bresto.pl
index f982692..c26d8d6 100755
--- a/gui/bweb/cgi/bresto.pl
+++ b/gui/bweb/cgi/bresto.pl
@@ -718,7 +718,7 @@ if ($action eq 'restore') {
}
# TODO: remove it after a while
- if ($bvfs->get_db_field('Comment') ne 'Comment') {
+ if ($bvfs->get_db_field('Job.Comment') ne 'Job.Comment') {
delete $arg->{comment};
}
diff --git a/gui/bweb/lang/en/tpl/client_list.tpl \
b/gui/bweb/lang/en/tpl/client_list.tpl index 7eaf58b..7a9afc8 100644
--- a/gui/bweb/lang/en/tpl/client_list.tpl
+++ b/gui/bweb/lang/en/tpl/client_list.tpl
@@ -11,7 +11,7 @@
<div class="otherbox">
<!-- <h1>Actions</h1> -->
<button type="submit" class="bp" name='action' value='job' title="Show last \
job"> <img src='/bweb/zoom.png' alt=''>Last jobs</button>
- <button type="submit" class="bp" name='action' value='dsp_cur_job' \
title='Show current job'> <img src='/bweb/zoom.png' alt=''>Current jobs</button> + \
<button type="submit" class="bp" name='action' value='running' title='Show current \
job'> <img src='/bweb/zoom.png' alt=''>Current jobs</button>
<button type="submit" class="bp" name='action' value='groups' title='View \
client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
<button type="submit" class="bp" name='action' value='client_status' \
title='Show client status'> <img src='/bweb/zoom.png' alt=''>Status \
</button>
<button type="submit" class="bp" name='action' value='client_stats' \
title='Client stats'> <img src='/bweb/chart.png' alt=''>Stats \
</button>
diff --git a/gui/bweb/lang/es/tpl/client_list.tpl \
b/gui/bweb/lang/es/tpl/client_list.tpl index 0459f5c..ae5cceb 100644
--- a/gui/bweb/lang/es/tpl/client_list.tpl
+++ b/gui/bweb/lang/es/tpl/client_list.tpl
@@ -10,11 +10,11 @@
</div>
<div class="otherbox">
<!-- <h1>Acciones</h1> -->
- <button type="submit" class="bp" name='action' value='job' title="Mostrar \
últimos jobs"> <img src='/bweb/zoom.png' alt=''>Últimos Jobs</button>
- <button type="submit" class="bp" name='action' value='dsp_cur_job' \
title='Mostrar job actual'> <img src='/bweb/zoom.png' alt=''>Current jobs</button> + \
<button type="submit" class="bp" name='action' value='job' title="Mostrar últimos \
jobs"> <img src='/bweb/zoom.png' alt=''>Últimos Jobs</button> + <button \
type="submit" class="bp" name='action' value='running' title='Mostrar job actual'> \
<img src='/bweb/zoom.png' alt=''>Current jobs</button>
<button type="submit" class="bp" name='action' value='groups' title='View \
client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
<button type="submit" class="bp" name='action' value='client_status' \
title='Mostrar estado del cliente'> <img src='/bweb/zoom.png' \
alt=''>Estado </button>
- <button type="submit" class="bp" name='action' value='client_stats' \
title='Estadísticas del Cliente'> <img src='/bweb/chart.png' alt=''>Estado </button> \
+ <button type="submit" class="bp" name='action' value='client_stats' \
title='EstadÃsticas del Cliente'> <img src='/bweb/chart.png' \
alt=''>Estado </button>
<button type="submit" class="bp" name='action' value='client_edit' \
title='Client groups'> <img src='/bweb/edit.png' alt=''>Edit groups </button> </div>
diff --git a/gui/bweb/lang/fr/tpl/client_list.tpl \
b/gui/bweb/lang/fr/tpl/client_list.tpl index 6c13e52..e6795ff 100644
--- a/gui/bweb/lang/fr/tpl/client_list.tpl
+++ b/gui/bweb/lang/fr/tpl/client_list.tpl
@@ -11,7 +11,7 @@
<div class="otherbox">
<!-- <h1>Actions</h1> -->
<button type="submit" class="bp" name='action' value='job' title="Voir \
l'historique"> <img src='/bweb/zoom.png' alt=''>Historique</button>
- <button type="submit" class="bp" name='action' value='dsp_cur_job' \
title='Voir les jobs en cours'> <img src='/bweb/zoom.png' alt=''>Jobs \
courants</button> + <button type="submit" class="bp" name='action' \
value='running' title='Voir les jobs en cours'> <img src='/bweb/zoom.png' alt=''>Jobs \
courants</button>
<button type="submit" class="bp" name='action' value='groups' title='View \
client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
<button type="submit" class="bp" name='action' value='client_status' \
title='Statistiques'> <img src='/bweb/zoom.png' alt=''>Statut \
</button>
<button type="submit" class="bp" name='action' value='client_stats' \
title='Statistiques'> <img src='/bweb/chart.png' alt=''>Stats \
</button>
diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index b1b0990..52abe32 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -2509,7 +2509,7 @@ JOIN client_group USING (client_group_id)
";
}
my $filter = $self->get_client_filter();
- my $comment = $self->get_db_field('Comment');
+ my $comment = $self->get_db_field('Job.Comment');
my $rb = $self->get_db_field('ReadBytes');
my $query="
SELECT Job.JobId AS jobid,
@@ -2557,8 +2557,8 @@ sub get_db_field
{
my ($self, $what) = @_ ;
- my %feature = ('Comment' => 4, 'ReadBytes' => 4);
- my %replacement = ('Comment' => "''", 'ReadBytes' => 'JobBytes');
+ my %feature = ('Job.Comment' => 4, 'ReadBytes' => 4);
+ my %replacement = ('Job.Comment' => "''", 'ReadBytes' => 'JobBytes');
if (!$self->{info}->{dir_ver} or
$self->{info}->{dir_ver} >= $feature{$what})
@@ -2579,7 +2579,7 @@ sub display_job_zoom
# get security filter
my $filter = $self->get_client_filter();
- my $comment = $self->get_db_field('Comment');
+ my $comment = $self->get_db_field('Job.Comment');
my $rb = $self->get_db_field('ReadBytes');
my $query="
SELECT DISTINCT Job.JobId AS jobid,
@@ -4170,6 +4170,12 @@ sub display_running_jobs
my ($self, $display_action) = @_;
return if $self->cant_do('r_view_running_job');
+ my $arg = $self->get_form('client');
+ my $client = "";
+ if ($arg->{client}) {
+ $client = " AND Client.Name = \'$arg->{client}\' ";
+ }
+
# get security filter
my $filter = $self->get_client_filter();
@@ -4186,6 +4192,7 @@ SELECT Job.JobId AS jobid,
FROM Job INNER JOIN Client USING (ClientId) $filter
WHERE
JobStatus IN ('C','R','B','e','D','F','S','m','M','s','j','c','d','t','p')
+ $client
";
my $all = $self->dbh_selectall_hashref($query, 'jobid') ;
diff --git a/gui/bweb/tpl/client_list.tpl b/gui/bweb/tpl/client_list.tpl
index 5aee981..647abc6 100644
--- a/gui/bweb/tpl/client_list.tpl
+++ b/gui/bweb/tpl/client_list.tpl
@@ -11,7 +11,7 @@
<div class="otherbox">
<!-- <h1>__Actions__</h1> -->
<button type="submit" class="bp" name='action' value='job' title="__Show last \
job__"> <img src='/bweb/zoom.png' alt=''>__Last jobs__</button>
- <button type="submit" class="bp" name='action' value='dsp_cur_job' \
title='__Show current job__'> <img src='/bweb/zoom.png' alt=''>__Current \
jobs__</button> + <button type="submit" class="bp" name='action' \
value='running' title='__Show current job__'> <img src='/bweb/zoom.png' \
alt=''>__Current jobs__</button>
<button type="submit" class="bp" name='action' value='groups' title='__View \
client groups__'> <img src='/bweb/zoom.png' alt=''>__View \
groups__</button>
<button type="submit" class="bp" name='action' value='client_status' \
title='__Show client status__'> <img src='/bweb/zoom.png' \
alt=''>__Status__ </button>
<button type="submit" class="bp" name='action' value='client_stats' \
title='__Client stats__'> <img src='/bweb/chart.png' alt=''>__Stats__ \
</button>
diff --git a/regress/run_multiple b/regress/run_multiple
index bff47b0..68f817e 100755
--- a/regress/run_multiple
+++ b/regress/run_multiple
@@ -1,4 +1,5 @@
#!/bin/sh
+./starttime
export REGRESS_DEBUG=1
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 ; do
echo "$i. Doing $1 at `date +%R:%S`"
@@ -9,3 +10,4 @@ for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 ; do
exit 1
fi
done
+./endtime
hooks/post-receive
--
Bacula Community source
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic