From f741ec4c375de362c5bcebcaa224b2330ea323cd Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Mon, 31 Dec 2007 09:57:04 +0000 Subject: [PATCH] ebl Add new role to view group members git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6167 91ce42f0-d328-0410-95d8-f526ca767f89 --- gui/bweb/lib/Bweb.pm | 5 +++-- gui/bweb/po/fr.po | 4 ++-- gui/bweb/script/bweb-mysql.sql | 1 + gui/bweb/script/bweb-postgresql.sql | 1 + gui/bweb/technotes-2.3 | 3 +++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm index 7a9604112e..251bf8c58e 100644 --- a/gui/bweb/lib/Bweb.pm +++ b/gui/bweb/lib/Bweb.pm @@ -2791,11 +2791,10 @@ sub update_location sub groups_edit { my ($self) = @_; - $self->can_do('r_group_mgnt'); - my $grp = $self->get_form(qw/qclient_group db_clients/); unless ($grp->{qclient_group}) { + $self->can_do('r_group_mgnt'); $self->display({ ID => $cur_id++, client_group => "''", %$grp, @@ -2803,6 +2802,8 @@ sub groups_edit return; } + $self->cant_do('r_group_mgnt') or $self->can_do('r_view_group'); + my $query = " SELECT Name AS name FROM Client JOIN client_group_member using (clientid) diff --git a/gui/bweb/po/fr.po b/gui/bweb/po/fr.po index d1e869b9e4..b68b477c50 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: 2007-12-27 21:13+0100\n" +"PO-Revision-Date: 2007-12-31 10:45+0100\n" "Last-Translator: Eric \n" "Language-Team: French\n" "MIME-Version: 1.0\n" @@ -1736,7 +1736,7 @@ msgstr "Slot :" #: ../tpl/update_media.tpl:42 msgid "InChanger Flag:" -msgstr "En ligne :" +msgstr "InChanger :" #: ../tpl/update_media.tpl:67 msgid "Retention period:" diff --git a/gui/bweb/script/bweb-mysql.sql b/gui/bweb/script/bweb-mysql.sql index a8f03c0112..cec40e27f3 100644 --- a/gui/bweb/script/bweb-mysql.sql +++ b/gui/bweb/script/bweb-mysql.sql @@ -74,6 +74,7 @@ INSERT INTO bweb_role (rolename) VALUES ('r_view_job'); INSERT INTO bweb_role (rolename) VALUES ('r_view_log'); INSERT INTO bweb_role (rolename) VALUES ('r_view_stat'); INSERT INTO bweb_role (rolename) VALUES ('r_view_media'); +INSERT INTO bweb_role (rolename) VALUES ('r_view_group'); INSERT INTO bweb_role (rolename) VALUES ('r_view_running_job'); INSERT INTO bweb_role (rolename) VALUES ('r_run_job'); diff --git a/gui/bweb/script/bweb-postgresql.sql b/gui/bweb/script/bweb-postgresql.sql index babb4f9c43..278d2f2cf0 100644 --- a/gui/bweb/script/bweb-postgresql.sql +++ b/gui/bweb/script/bweb-postgresql.sql @@ -97,6 +97,7 @@ INSERT INTO bweb_role (rolename) VALUES ('r_view_job'); INSERT INTO bweb_role (rolename) VALUES ('r_view_log'); INSERT INTO bweb_role (rolename) VALUES ('r_view_media'); INSERT INTO bweb_role (rolename) VALUES ('r_view_stat'); +INSERT INTO bweb_role (rolename) VALUES ('r_view_group'); INSERT INTO bweb_role (rolename) VALUES ('r_view_running_job'); INSERT INTO bweb_role (rolename) VALUES ('r_run_job'); diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3 index 8f04e53b2f..085764f4ba 100644 --- a/gui/bweb/technotes-2.3 +++ b/gui/bweb/technotes-2.3 @@ -1,3 +1,6 @@ +31Dec07 +ebl Add new r_view_group role to view group content + 27Dec07 ebl Fix a bug in user edition. ebl Add Jobs -> Missing Job feature. Now, you can -- 2.39.5