[evolvis-commits] r11056: fixed [#1394] duplicate SCM summary in project home pag?==?UTF-8?Q?e↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 18:00:59 CET 2011
Author: mirabilos
Date: 2011-02-24 18:00:59 +0100 (Thu, 24 Feb 2011)
New Revision: 11056
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/include/CVSPlugin.class
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/changelog
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/include/SVNPlugin.class
trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php
Log:
fixed [#1394] duplicate SCM summary in project home page
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog 2011-02-24 17:00:58 UTC (rev 11055)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog 2011-02-24 17:00:59 UTC (rev 11056)
@@ -1,3 +1,7 @@
+2005-07-07 Christian Bayle <bayle at debian.org>
+
+ * Fixed [#1394] duplicate SCM summary in project home page
+
2005-06-30 Marcelo Mottalli <marcelo at gforgegroup.com>
* Added FRS interface to the SOAP server
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-24 17:00:58 UTC (rev 11055)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-24 17:00:59 UTC (rev 11056)
@@ -1,4 +1,4 @@
-gforge (4.1-7) unstable; urgency=low
+gforge (4.1-8) unstable; urgency=low
* [Christian] Added 20050605.sql, 20050617.php, 20050628.sql in db-upgrade
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php 2011-02-24 17:00:58 UTC (rev 11055)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php 2011-02-24 17:00:59 UTC (rev 11056)
@@ -342,6 +342,7 @@
print html_image('ic/cvs16b.png','20','20',array('alt'=>$Language->getText('group','short_scm')));
print " ".$Language->getText('group','long_scm')."</a>";
+ /*
$result = db_query("
SELECT sum(commits) AS commits,sum(adds) AS adds
FROM stats_cvs_group
@@ -355,6 +356,7 @@
if (!$cvs_add_num) {
$cvs_add_num=0;
}
+ */
$hook_params = array () ;
$hook_params['group_id'] = $group_id ;
plugin_hook ("scm_stats", $hook_params) ;
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog 2011-02-24 17:00:58 UTC (rev 11055)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog 2011-02-24 17:00:59 UTC (rev 11056)
@@ -1,4 +1,4 @@
-gforge-plugin-scmcvs (4.1-7) unstable; urgency=low
+gforge-plugin-scmcvs (4.1-8) unstable; urgency=low
* [Christian] Version taking in account nss
* [Christian] Make cvs_dump.pl script select only groups that use
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/include/CVSPlugin.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/include/CVSPlugin.class 2011-02-24 17:00:58 UTC (rev 11055)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/include/CVSPlugin.class 2011-02-24 17:00:59 UTC (rev 11056)
@@ -193,19 +193,28 @@
function display_stats ($params) {
global $Language ;
$group_id = $params['group_id'] ;
- $result = db_query("
- SELECT sum(commits) AS commits, sum(adds) AS adds
- FROM stats_cvs_group
- WHERE group_id='$group_id'");
- $commit_num = db_result($result,0,'commits');
- $add_num = db_result($result,0,'adds');
- if (!$commit_num) {
- $commit_num=0;
+ $project =& group_get_object($group_id);
+ if (!$project || !is_object($project)) {
+ return false;
+ } elseif ($project->isError()) {
+ return false;
}
- if (!$add_num) {
- $add_num=0;
+
+ if ($project->usesPlugin($this->name)) {
+ $result = db_query("
+ SELECT sum(commits) AS commits, sum(adds) AS adds
+ FROM stats_cvs_group
+ WHERE group_id='$group_id'");
+ $commit_num = db_result($result,0,'commits');
+ $add_num = db_result($result,0,'adds');
+ if (!$commit_num) {
+ $commit_num=0;
+ }
+ if (!$add_num) {
+ $add_num=0;
+ }
+ echo ' (CVS: '.$Language->getText('plugin_scmcvs','cvs_commits',array(number_format($commit_num,0),number_format($add_num,0))).")";
}
- echo ' (CVS: '.$Language->getText('plugin_scmcvs','cvs_commits',array(number_format($commit_num,0),number_format($add_num,0))).")";
}
function display_detailed_stats ($params) {
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/changelog 2011-02-24 17:00:58 UTC (rev 11055)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/changelog 2011-02-24 17:00:59 UTC (rev 11056)
@@ -1,4 +1,4 @@
-gforge-plugin-scmsvn (4.1-7) unstable; urgency=low
+gforge-plugin-scmsvn (4.1-8) unstable; urgency=low
* New upstream
* [Christian] Added dependancy to php4-cli
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/include/SVNPlugin.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/include/SVNPlugin.class 2011-02-24 17:00:58 UTC (rev 11055)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/include/SVNPlugin.class 2011-02-24 17:00:59 UTC (rev 11056)
@@ -196,8 +196,8 @@
}
function display_scm_admin_page ($params) {
+ global $Language ;
$group =& group_get_object($params['group_id']);
- global $Language ;
if ( $group->usesPlugin ( $this->name ) ) {
?>
<p><input type="checkbox" name="scmsvn_enable_anon_svn" value="1" <?php echo $this->c($group->enableAnonSCM()); ?> /><strong><?php echo $Language->getText('plugin_scmsvn', 'enable_anonymous_svn') ?></strong></p>
@@ -208,8 +208,17 @@
function display_stats ($params) {
global $Language ;
$group_id = $params['group_id'] ;
- list($commit_num, $add_num) = $this->get_total_stats($group_id);
- echo ' (SVN: '.$Language->getText('plugin_scmsvn','svn_updates',array(number_format($commit_num,0),number_format($add_num,0))).')';
+ $project =& group_get_object($group_id);
+ if (!$project || !is_object($project)) {
+ return false;
+ } elseif ($project->isError()) {
+ return false;
+ }
+
+ if ($project->usesPlugin ($this->name)) {
+ list($commit_num, $add_num) = $this->get_total_stats($group_id);
+ echo ' (SVN: '.$Language->getText('plugin_scmsvn','svn_updates',array(number_format($commit_num,0),number_format($add_num,0))).')';
+ }
}
// Get the total stats for a group
More information about the evolvis-commits
mailing list