[Fusionforge-commits] FusionForge branch Branch_5_3 updated. c0c1f1152caf20fe369bd9f6ad41a8d45e34dca9

Franck Villaume nerville at fusionforge.org
Sat Oct 4 11:04:44 CEST 2014


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, Branch_5_3 has been updated
       via  c0c1f1152caf20fe369bd9f6ad41a8d45e34dca9 (commit)
       via  074c3d6d8fadc4b7e53186f69a0fa312c76abfe8 (commit)
      from  a598e8eaaf6dafabe8b67ca475c6399df2b9b077 (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 -----------------------------------------------------------------
commit c0c1f1152caf20fe369bd9f6ad41a8d45e34dca9
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Oct 4 11:03:08 2014 +0200

    sync

diff --git a/src/CHANGES b/src/CHANGES
index a003be8..0f16abb 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,6 +1,7 @@
 Fusionforge-5.3.3:
 * Plugin AuthLDAP: error and warning messages displayed twice [#732] (TrivialDev)
 * Plugin scmhook: fix display when only one SCM plugin enabled [#735] (TrivialDev)
+* Stats SCM: fix order in stats block [#736] (TrivialDev)
 
 Fusionforge-5.3.2:
 * Software map: fix "value too long for type character varying(255)" error in cron db_trove_maint.php (Inria)

commit 074c3d6d8fadc4b7e53186f69a0fa312c76abfe8
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Oct 4 11:02:19 2014 +0200

    fix [#736] SCM stats block: wrong order

diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index baadd6b..7d51477 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -345,7 +345,7 @@ class GitPlugin extends SCMPlugin {
 		global $HTML;
 		$b = '';
 
-		$result = db_query_params('SELECT u.realname, u.user_name, u.user_id, sum(updates) as updates, sum(adds) as adds, sum(adds+commits) as combined FROM stats_cvs_user s, users u WHERE group_id=$1 AND s.user_id=u.user_id AND (commits>0 OR adds >0) GROUP BY u.user_id, realname, user_name, u.user_id ORDER BY combined DESC, realname',
+		$result = db_query_params('SELECT u.realname, u.user_name, u.user_id, sum(updates) as updates, sum(adds) as adds, sum(adds+updates) as combined FROM stats_cvs_user s, users u WHERE group_id=$1 AND s.user_id=u.user_id AND (updates>0 OR adds >0) GROUP BY u.user_id, realname, user_name, u.user_id ORDER BY combined DESC, realname',
 			array($project->getID()));
 
 		if (db_numrows($result) > 0) {
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 3296a14..d57e921 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -212,7 +212,7 @@ class SVNPlugin extends SCMPlugin {
 		global $HTML ;
 		$b = '' ;
 
-		$result = db_query_params('SELECT u.realname, u.user_name, u.user_id, sum(updates) as updates, sum(adds) as adds, sum(adds+commits) as combined FROM stats_cvs_user s, users u WHERE group_id=$1 AND s.user_id=u.user_id AND (commits>0 OR adds >0) GROUP BY u.user_id, realname, user_name, u.user_id ORDER BY combined DESC, realname',
+		$result = db_query_params('SELECT u.realname, u.user_name, u.user_id, sum(updates) as updates, sum(adds) as adds, sum(adds+updates) as combined FROM stats_cvs_user s, users u WHERE group_id=$1 AND s.user_id=u.user_id AND (updates>0 OR adds >0) GROUP BY u.user_id, realname, user_name, u.user_id ORDER BY combined DESC, realname',
 					  array ($project->getID()));
 
 		if (db_numrows($result) > 0) {

-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES                                   |    1 +
 src/plugins/scmgit/common/GitPlugin.class.php |    2 +-
 src/plugins/scmsvn/common/SVNPlugin.class.php |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list