From: Eric Bollengier Date: Tue, 12 Feb 2008 18:34:33 +0000 (+0000) Subject: ebl Sort client, job and fileset combo X-Git-Tag: Release-3.0.0~1881 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=844429003de389d933a3818a55fc0ac5c13945e2;p=bacula%2Fbacula ebl Sort client, job and fileset combo git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6406 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/gui/bweb/cgi/bresto.pl b/gui/bweb/cgi/bresto.pl index 26724402bd..60474c4cd8 100755 --- a/gui/bweb/cgi/bresto.pl +++ b/gui/bweb/cgi/bresto.pl @@ -884,6 +884,7 @@ if ($action eq 'restore') { SELECT max(JobId) as JobId, PathId, FilenameId FROM btemp GROUP BY PathId, FilenameId + HAVING FileIndex > 0 )"); $bvfs->dbh_do("CREATE TABLE b2$$ AS ( SELECT btemp.JobId, btemp.FileIndex, btemp.FilenameId, btemp.PathId @@ -897,6 +898,7 @@ SELECT btemp.JobId, btemp.FileIndex, btemp.FilenameId, btemp.PathId SELECT DISTINCT ON (PathId, FilenameId) JobId, FileIndex FROM btemp ORDER BY PathId, FilenameId, JobId DESC + HAVING FileIndex > 0 )"); } diff --git a/gui/bweb/lib/Bconsole.pm b/gui/bweb/lib/Bconsole.pm index beae967be4..808b5518f3 100644 --- a/gui/bweb/lib/Bconsole.pm +++ b/gui/bweb/lib/Bconsole.pm @@ -326,31 +326,31 @@ sub get_fileset sub list_job { my ($self) = @_; - return split(/\r\n/, $self->send_cmd(".jobs")); + return sort split(/\r\n/, $self->send_cmd(".jobs")); } sub list_fileset { my ($self) = @_; - return split(/\r\n/, $self->send_cmd(".filesets")); + return sort split(/\r\n/, $self->send_cmd(".filesets")); } sub list_storage { my ($self) = @_; - return split(/\r\n/, $self->send_cmd(".storage")); + return sort split(/\r\n/, $self->send_cmd(".storage")); } sub list_client { my ($self) = @_; - return split(/\r\n/, $self->send_cmd(".clients")); + return sort split(/\r\n/, $self->send_cmd(".clients")); } sub list_pool { my ($self) = @_; - return split(/\r\n/, $self->send_cmd(".pools")); + return sort split(/\r\n/, $self->send_cmd(".pools")); } use Time::ParseDate qw/parsedate/; diff --git a/gui/bweb/po/fr.po b/gui/bweb/po/fr.po index a9299aa9ac..694e2a9f0a 100644 --- a/gui/bweb/po/fr.po +++ b/gui/bweb/po/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2008-01-01 15:04+0100\n" +"PO-Revision-Date: 2008-02-12 16:51+0100\n" "Last-Translator: Eric \n" "Language-Team: French\n" "MIME-Version: 1.0\n" @@ -1071,7 +1071,7 @@ msgstr "Internaliser" #: ../tpl/display_media.tpl:24 ../tpl/display_media_zoom.tpl:19 msgid "Load" -msgstr "" +msgstr "Internaliser" #: ../tpl/display_media.tpl:25 ../tpl/update_media.tpl:3 msgid "Update media" @@ -1091,7 +1091,7 @@ msgstr "Prune" #: ../tpl/display_media.tpl:36 ../tpl/display_media_zoom.tpl:43 msgid "Online" -msgstr "" +msgstr "En ligne" #: ../tpl/display_media.tpl:36 msgid "Vol Usage" @@ -1597,7 +1597,7 @@ msgstr "Co #: ../tpl/location_add.tpl:17 ../tpl/location_edit.tpl:18 #: ../tpl/move_media.tpl:15 ../tpl/update_media.tpl:49 msgid "Enabled:" -msgstr "En ligne :" +msgstr "Activé :" #: ../tpl/location_add.tpl:19 ../tpl/location_edit.tpl:20 #: ../tpl/move_media.tpl:18 ../tpl/update_media.tpl:51