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 "FusionForge".
The branch, master has been updated
via 9c0a01157e381a3fc31d8799f277341fc2cfbabb (commit)
from c3befd2f3dd55132d589647f2ed5d56b543302dc (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9c0a01157e381a3fc31d8799f277341fc2cfbabb
commit 9c0a01157e381a3fc31d8799f277341fc2cfbabb
Author: Franck Villaume <[email protected]>
Date: Sun Jun 16 18:58:05 2019 +0200
quota_management: move to a dedicated table
diff --git a/src/plugins/quota_management/action/update.php
b/src/plugins/quota_management/action/update.php
index 91a6ecd..dbd77dc 100644
--- a/src/plugins/quota_management/action/update.php
+++ b/src/plugins/quota_management/action/update.php
@@ -37,7 +37,7 @@ $qh = $_POST["qh"] * $_quota_block_size;
if ($qs > $qh) {
$error_msg = _('Input error: Hard quota must be greater than soft
quota');
} else {
- db_query_params('UPDATE groups SET quota_soft = $1, quota_hard = $2
WHERE group_id = $3',
+ db_query_params('UPDATE plugin_quota_management SET quota_soft = $1,
quota_hard = $2 WHERE group_id = $3',
array($qs,
$qh,
getIntFromRequest('group_id')));
diff --git
a/src/plugins/quota_management/db/20190616_move_to_dedicate_table.sql
b/src/plugins/quota_management/db/20190616_move_to_dedicate_table.sql
new file mode 100644
index 0000000..1fa61f5
--- /dev/null
+++ b/src/plugins/quota_management/db/20190616_move_to_dedicate_table.sql
@@ -0,0 +1,15 @@
+CREATE TABLE plugin_quota_management (
+ group_id int NOT NULL,
+ quota_soft int NOT NULL,
+ quota_hard int NOT NULL,
+ quota_db_soft int NOT NULL,
+ quota_db_hard int NOT NULL,
+ FOREIGN KEY (group_id) REFERENCES groups (group_id) ON DELETE CASCADE
ON UPDATE CASCADE
+);
+
+CREATE INDEX plugin_quota_management_gid_idx ON
plugin_quota_management(group_id);
+
+INSERT INTO plugin_quota_management (SELECT group_id, 0, 0, 0, 0 FROM groups);
+
+ALTER TABLE groups DROP COLUMN IF EXISTS quota_soft;
+ALTER TABLE groups DROP COLUMN IF EXISTS quota_hard;
diff --git a/src/plugins/quota_management/view/quota_admin.php
b/src/plugins/quota_management/view/quota_admin.php
index 5451d62..becd761 100644
--- a/src/plugins/quota_management/view/quota_admin.php
+++ b/src/plugins/quota_management/view/quota_admin.php
@@ -50,7 +50,7 @@ echo $HTML->subMenu($subMenuTitle, $subMenuUrl, $subMenuAttr);
$quotas = array();
// all projects list
-$res_db = db_query_params('SELECT group_id, group_name, unix_group_name,
quota_soft, quota_hard FROM groups ORDER BY group_id ',
+$res_db = db_query_params('SELECT groups.group_id, groups.group_name,
groups.unix_group_name, plugin_quota_management.quota_soft,
plugin_quota_management.quota_hard FROM plugin_quota_management, groups ORDER
BY group_id ',
array());
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
diff --git a/src/plugins/quota_management/view/quota_project.php
b/src/plugins/quota_management/view/quota_project.php
index 5008823..65b1192 100644
--- a/src/plugins/quota_management/view/quota_project.php
+++ b/src/plugins/quota_management/view/quota_project.php
@@ -114,7 +114,7 @@ $_quota_block_size = trim(shell_exec('echo $BLOCK_SIZE')) +
0;
if ($_quota_block_size == 0) $_quota_block_size = 1024;
$quota_soft = "";
$quota_hard = "";
-$res_db = db_query_params('SELECT quota_soft, quota_hard FROM groups WHERE
group_id = $1',
+$res_db = db_query_params('SELECT quota_soft, quota_hard FROM
plugin_quota_management WHERE group_id = $1',
array($group_id));
if (db_numrows($res_db) > 0) {
$e = db_fetch_array($res_db);
@@ -302,6 +302,7 @@ if (($quota_tot_scm+0) > ($qs+0) && ($qs+0) > 0) {
?>
</td>
</tr>
+<?php if ($group->usesSCM()) { ?>
<tr style="background:<?php echo $color2; ?>">
<td style="border-top:thin solid #808080">
<?php echo _('SCM'); ?>
@@ -330,6 +331,7 @@ if (($quota_tot_scm+0) > ($qs+0) && ($qs+0) > 0) {
?>
</td>
</tr>
+<?php } ?>
<tr style="font-weight:bold">
<td colspan="4" style="border-top:thick solid #808080"
align="center"> </td>
</tr>
-----------------------------------------------------------------------
Summary of changes:
src/plugins/quota_management/action/update.php | 2 +-
.../db/20190616_move_to_dedicate_table.sql | 15 +++++++++++++++
src/plugins/quota_management/view/quota_admin.php | 2 +-
src/plugins/quota_management/view/quota_project.php | 4 +++-
4 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644
src/plugins/quota_management/db/20190616_move_to_dedicate_table.sql
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
