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 1c8715b76c19ce660e11d75915bf4f0a8fccebd3 (commit)
from 375f5830960934678bca511ea26845076d1a4214 (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=1c8715b76c19ce660e11d75915bf4f0a8fccebd3
commit 1c8715b76c19ce660e11d75915bf4f0a8fccebd3
Author: Franck Villaume <[email protected]>
Date: Fri Jun 28 22:07:36 2019 +0200
adjust quota_admin to reflect database changes
diff --git a/src/plugins/quota_management/view/quota.php
b/src/plugins/quota_management/view/quota.php
index caf0eed..afb964b 100644
--- a/src/plugins/quota_management/view/quota.php
+++ b/src/plugins/quota_management/view/quota.php
@@ -52,7 +52,8 @@ 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 plugin_quota_management.*,
groups.group_name, groups.unix_group_name FROM plugin_quota_management, groups
+ WHERE plugin_quota_management.group_id =
groups.group_id 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_admin.php
b/src/plugins/quota_management/view/quota_admin.php
index becd761..abca812 100644
--- a/src/plugins/quota_management/view/quota_admin.php
+++ b/src/plugins/quota_management/view/quota_admin.php
@@ -50,7 +50,8 @@ echo $HTML->subMenu($subMenuTitle, $subMenuUrl, $subMenuAttr);
$quotas = array();
// all projects list
-$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 ',
+$res_db = db_query_params('SELECT plugin_quota_management.*,
groups.group_name, groups.unix_group_name FROM plugin_quota_management, groups
+ WHERE plugin_quota_management.group_id =
groups.group_id 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 343a8ff..b3e61cc 100644
--- a/src/plugins/quota_management/view/quota_project.php
+++ b/src/plugins/quota_management/view/quota_project.php
@@ -154,19 +154,17 @@ $quota_tot_1 = 0;
$quota_tot_scm = 0;
if (forge_get_config('use_shell')) {
- $group_dir = forge_get_config('groupdir_prefix') . "/" .
$group->getUnixName();
$q["name"] = _('Home project directory');
- $q["path"] = "$group_dir"; $q["size"] =
$quota_management->get_dir_size("$group_dir");
- $q["quota_label"] = _('With ftp and home quota control');
+ $q["size"] = $quota_management->getHomeSize($group_id);
+ $q["quota_label"] = _('With Home quota control');
$quota_tot_1 += $q["size"];
$quotas_disk[] = $q;
}
if ($group->usesFTP()) {
- $ftp_dir =
forge_get_config('ftp_upload_dir')."/pub/".$group->getUnixName();
$q["name"] = _('FTP project directory');
- $q["path"] = "$ftp_dir"; $q["size"] =
$quota_management->get_dir_size("$ftp_dir");
- $q["quota_label"] = _('With ftp and home quota control');
+ $q["size"] = $quota_management->getFTPSize($group_id);
+ $q["quota_label"] = _('With FTP quota control');
$quota_tot_1 += $q["size"];
$quotas_disk[] = $q;
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/quota_management/view/quota.php | 3 ++-
src/plugins/quota_management/view/quota_admin.php | 3 ++-
src/plugins/quota_management/view/quota_project.php | 10 ++++------
3 files changed, 8 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
