ebl Add a tpl field to bweb_user. (To be able to have a tpl for each

     user).

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5975 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/bweb/script/bweb-mysql.sql b/gui/bweb/script/bweb-mysql.sql
index 601d569c48ac121bd919986efea09327e64b0561..2e21aaf82c2ea15cede1535b26426bb86a0e282e 100644 (file)
--- a/gui/bweb/script/bweb-mysql.sql
+++ b/gui/bweb/script/bweb-mysql.sql
@@ -35,22 +35,23 @@ CREATE INDEX brestore_pathvisibility_jobid
 
 CREATE TABLE bweb_user
 (
-       userid       serial not null,
-       username     text not null,
-       use_acl      boolean default false,
-       enabled      boolean default true,
+        userid       serial not null,
+        username     text not null,
+        use_acl      boolean default false,
+        enabled      boolean default true,
         comment      text default '',
-       passwd       text default '',
-       primary key (userid)
+        passwd       text default '',
+        tpl          text default '',
+        primary key (userid)
 );
 CREATE UNIQUE INDEX bweb_user_idx on bweb_user (username(255));
 
 CREATE TABLE bweb_role
 (
-       roleid       serial not null,
-       rolename     text not null,
---     comment      text default '',
-       primary key (roleid)
+        roleid       serial not null,
+        rolename     text not null,
+--      comment      text default '',
+        primary key (roleid)
 );
 CREATE UNIQUE INDEX bweb_role_idx on bweb_role (rolename(255));
 INSERT INTO bweb_role (rolename) VALUES ('r_user_mgnt');
@@ -75,16 +76,16 @@ INSERT INTO bweb_role (rolename) VALUES ('r_client_status');
 
 CREATE TABLE  bweb_role_member
 (
-       roleid       integer not null,
-       userid       integer not null,
-       primary key (roleid, userid)
+        roleid       integer not null,
+        userid       integer not null,
+        primary key (roleid, userid)
 );
 
 CREATE TABLE  bweb_client_group_acl
 (
-       client_group_id       integer not null,
-       userid                integer not null,
-       primary key (client_group_id, userid)
+        client_group_id       integer not null,
+        userid                integer not null,
+        primary key (client_group_id, userid)
 );
 
 
@@ -97,8 +98,8 @@ CREATE TABLE  bweb_client_group_acl
 
 CREATE TABLE client_group
 (
-    client_group_id             serial   not null,
-    client_group_name          text      not null,
+    client_group_id             serial    not null,
+    client_group_name           text      not null,
     primary key (client_group_id)
 );
 
@@ -106,7 +107,7 @@ CREATE UNIQUE INDEX client_group_idx on client_group (client_group_name(255));
 
 CREATE TABLE client_group_member
 (
-    client_group_id                integer       not null,
+    client_group_id   integer     not null,
     clientid          integer     not null,
     primary key (client_group_id, clientid)
 );

diff --git a/gui/bweb/script/bweb-postgresql.sql b/gui/bweb/script/bweb-postgresql.sql
index 7bab62c00b8b62d0268582088c6c1ba2434a97b3..b02acb559877bf30e3d1184e073eac3bb9830fd9 100644 (file)
--- a/gui/bweb/script/bweb-postgresql.sql
+++ b/gui/bweb/script/bweb-postgresql.sql
@@ -59,22 +59,23 @@ initcond = ''
 BEGIN;
 CREATE TABLE bweb_user
 (
-       userid       serial not null,
-       username     text not null,
-       use_acl      boolean default false,
-       enabled      boolean default true,
+        userid       serial not null,
+        username     text not null,
+        use_acl      boolean default false,
+        enabled      boolean default true,
         comment      text default '',
-       passwd       text default '',
-       primary key (userid)
+        passwd       text default '',
+        tpl          text default '',
+        primary key (userid)
 );
 CREATE UNIQUE INDEX bweb_user_idx on bweb_user (username);
 
 CREATE TABLE bweb_role
 (
-       roleid       serial not null,
-       rolename     text not null,
---     comment      text default '',
-       primary key (roleid)
+        roleid       serial not null,
+        rolename     text not null,
+--      comment      text default '',
+        primary key (roleid)
 );
 CREATE UNIQUE INDEX bweb_role_idx on bweb_role (rolename);
 
@@ -100,16 +101,16 @@ INSERT INTO bweb_role (rolename) VALUES ('r_client_status');
 
 CREATE TABLE  bweb_role_member
 (
-       roleid       integer not null,
-       userid       integer not null,
-       primary key (roleid, userid)
+        roleid       integer not null,
+        userid       integer not null,
+        primary key (roleid, userid)
 );
 
 CREATE TABLE  bweb_client_group_acl
 (
-       client_group_id       integer not null,
-       userid                integer not null,
-       primary key (client_group_id, userid)
+        client_group_id       integer not null,
+        userid                integer not null,
+        primary key (client_group_id, userid)
 );
 COMMIT;
 -- --------------------------------------------------
@@ -122,8 +123,8 @@ BEGIN;
 
 CREATE TABLE client_group
 (
-    client_group_id             serial   not null,
-    client_group_name          text      not null,
+    client_group_id             serial    not null,
+    client_group_name           text      not null,
     primary key (client_group_id)
 );
 
@@ -131,7 +132,7 @@ CREATE UNIQUE INDEX client_group_idx on client_group (client_group_name);
 
 CREATE TABLE client_group_member
 (
-    client_group_id                integer       not null,
+    client_group_id                 integer       not null,
     clientid          integer     not null,
     primary key (client_group_id, clientid)
 );

diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index 67602de8aa82eb2a4eacb291ba606cf947c174f3..a903fa724c35102f2d7d528e12b2f02c4487e5d3 100644 (file)
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,6 +1,8 @@
 24Nov07
 ebl  Add a wiki option to integrate a link to jobs documentation
      directly in bweb.
+ebl  Add a tpl field to bweb_user. (To be able to have a tpl for each
+     user).
 
 23Nov07
 ebl  Add brestore_xxx tables to sql scripts