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 c3befd2f3dd55132d589647f2ed5d56b543302dc (commit)
via ea3f489d8ab78f4ac6771485275b77ffcff22c5c (commit)
via 738d7a7920f7e2c0fb464b7ec386e13d8358e93c (commit)
from 26574d6504394146638f2d4e34e9f23bf46330d8 (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=c3befd2f3dd55132d589647f2ed5d56b543302dc
commit c3befd2f3dd55132d589647f2ed5d56b543302dc
Author: Franck Villaume <[email protected]>
Date: Sun Jun 16 18:33:37 2019 +0200
quota_management: support tracker on displayed data
diff --git
a/src/plugins/quota_management/common/quota_managementPlugin.class.php
b/src/plugins/quota_management/common/quota_managementPlugin.class.php
index 95bad08..bf7037d 100644
--- a/src/plugins/quota_management/common/quota_managementPlugin.class.php
+++ b/src/plugins/quota_management/common/quota_managementPlugin.class.php
@@ -105,6 +105,16 @@ to monitor disk and database usage per user, project.");
FROM doc_data, doc_data_version WHERE
doc_data.docid = doc_data_version.docid AND doc_data.group_id = $1 GROUP BY
doc_data.group_id',
array($group_id));
}
+
+ function getTrackerSizeForProject($group_id) {
+ return db_query_params('select
SUM(octet_length(artifact.summary)+octet_length(artifact.details)+octet_length(artifact_message.body)+artifact_file.filesize)
as size, count(artifact_group_list.group_artifact_id) as nb
+ FROM artifact, artifact_group_list,
artifact_message, artifact_file
+ WHERE artifact.group_artifact_id =
artifact_group_list.group_artifact_id
+ AND artifact.artifact_id =
artifact_message.artifact_id
+ AND artifact.artifact_id =
artifact_file.artifact_id
+ AND group_id = $1',
+ array($group_id));
+ }
}
// Local Variables:
diff --git a/src/plugins/quota_management/view/quota_project.php
b/src/plugins/quota_management/view/quota_project.php
index a8529ca..5008823 100644
--- a/src/plugins/quota_management/view/quota_project.php
+++ b/src/plugins/quota_management/view/quota_project.php
@@ -60,8 +60,8 @@ if ($group->usesDocman()) {
$q1["nb"] = $e["nb"];
$q1["size"] = $e["size1"];
}
- $quotas[0] = $q;
- $quotas[1] = $q1;
+ $quotas[] = $q;
+ $quotas[] = $q1;
}
if ($group->usesNews()) {
@@ -76,7 +76,7 @@ if ($group->usesNews()) {
$q["nb"] = $e["nb"];
$q["size"] = $e["size"];
}
- $quotas[2] = $q;
+ $quotas[] = $q;
}
if ($group->usesForum()) {
@@ -90,7 +90,20 @@ if ($group->usesForum()) {
$q["nb"] = $e["nb"];
$q["size"] = $e["size"];
}
- $quotas[3] = $q;
+ $quotas[] = $q;
+}
+
+if ($group->usesTracker()) {
+ $res_db = $quota_management->getTrackerSizeForProject($group_id);
+ $q = array();
+ $q["name"] = _('Trackers');
+ $q["nb"] = 0; $q["size"] = 0;
+ if (db_numrows($res_db) > 0) {
+ $e = db_fetch_array($res_db);
+ $q["nb"] = $e["nb"];
+ $q["size"] = $e["size"];
+ }
+ $quotas[] = $q;
}
$quotas_disk = array();
@@ -118,8 +131,6 @@ $quota_tot_scm = 0;
$upload_dir = forge_get_config('upload_dir') . $group->getUnixName();
$ftp_dir = forge_get_config('ftp_upload_dir')."/pub/".$group->getUnixName();
$group_dir = forge_get_config('groupdir_prefix') . "/" . $group->getUnixName();
-$cvs_dir = forge_get_config('repos_path', 'scmcvs') . "/" .
$group->getUnixName();
-$svn_dir = forge_get_config('repos_path', 'scmsvn') . "/" .
$group->getUnixName();
$q["name"] = _('Download project directory');
$q["path"] = "$upload_dir";
@@ -128,29 +139,23 @@ $q["size"] =
$quota_management->get_dir_size("$upload_dir");
$quota_tot_other += $q["size"];
$quotas_disk[] = $q;
-$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');
-$quota_tot_1 += $q["size"];
-$quotas_disk[] = $q;
-
-$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');
-$quota_tot_1 += $q["size"];
-$quotas_disk[] = $q;
+if (forge_get_config('use_shell')) {
+ $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');
+ $quota_tot_1 += $q["size"];
+ $quotas_disk[] = $q;
+}
-$q["name"] = _('CVS project directory');
-$q["path"] = "$cvs_dir"; $q["size"] =
$quota_management->get_dir_size("$cvs_dir");
-$q["quota_label"] = _('With cvs and svn quota control');
-$quota_tot_scm += $q["size"];
-$quotas_disk[] = $q;
+if ($group->usesFTP()) {
+ $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');
+ $quota_tot_1 += $q["size"];
+ $quotas_disk[] = $q;
+}
-$q["name"] = _('Subversion project directory');
-$q["path"] = "$svn_dir"; $q["size"] =
$quota_management->get_dir_size("$svn_dir");
-$q["quota_label"] = _('With cvs and svn quota control');
-$quota_tot_scm += $q["size"];
-$quotas_disk[] = $q;
+plugin_hook_by_reference('quota_display', $quotas_disk);
?>
@@ -299,7 +304,7 @@ if (($quota_tot_scm+0) > ($qs+0) && ($qs+0) > 0) {
</tr>
<tr style="background:<?php echo $color2; ?>">
<td style="border-top:thin solid #808080">
- <?php echo 'CVS, Subversion'; ?>
+ <?php echo _('SCM'); ?>
</td>
<td style="border-top:thin solid
#808080;font-weight:bold;color:red" align="right">
<?php echo $msg2; ?>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ea3f489d8ab78f4ac6771485275b77ffcff22c5c
commit ea3f489d8ab78f4ac6771485275b77ffcff22c5c
Author: Franck Villaume <[email protected]>
Date: Sun Jun 16 18:32:34 2019 +0200
tabs
diff --git a/src/plugins/quota_management/view/quota.php
b/src/plugins/quota_management/view/quota.php
index 6d56efa..caf0eed 100644
--- a/src/plugins/quota_management/view/quota.php
+++ b/src/plugins/quota_management/view/quota.php
@@ -81,7 +81,7 @@ if (forge_get_config('use_docman')) {
}
// news database size
- if (forge_get_config('use_news')) {
+if (forge_get_config('use_news')) {
$res_db = db_query_params('SELECT group_id, SUM(octet_length(summary) +
octet_length(details)) as size FROM news_bytes GROUP BY group_id',
array());
if (db_numrows($res_db) > 0) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=738d7a7920f7e2c0fb464b7ec386e13d8358e93c
commit 738d7a7920f7e2c0fb464b7ec386e13d8358e93c
Author: Franck Villaume <[email protected]>
Date: Sun Jun 16 18:27:34 2019 +0200
remove useless comment
diff --git a/src/www/admin/groupedit.php b/src/www/admin/groupedit.php
index d2bab8b..22fa81d 100644
--- a/src/www/admin/groupedit.php
+++ b/src/www/admin/groupedit.php
@@ -178,7 +178,6 @@ printf(_('With PFO-RBAC, the “is_public” property is gone.
Instead, to make
</tr>
<?php
-
if (forge_get_config('use_shell')) {
?>
<tr>
@@ -189,7 +188,7 @@ printf(_('With PFO-RBAC, the “is_public” property is gone.
Instead, to make
<input type="text" name="form_box" value="<?php echo $group->getUnixBox(); ?>"
/>
</td>
</tr>
-<?php } //end sus_use_shell condition ?>
+<?php } ?>
<tr>
<td>
-----------------------------------------------------------------------
Summary of changes:
.../common/quota_managementPlugin.class.php | 10 ++++
src/plugins/quota_management/view/quota.php | 2 +-
.../quota_management/view/quota_project.php | 61 ++++++++++++----------
src/www/admin/groupedit.php | 3 +-
4 files changed, 45 insertions(+), 31 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
