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, 6.1 has been updated
via f3caacfa432aa1d40c0ba1ca2f30a64836c74af6 (commit)
via 2ac5cf674635ca1b04ac34965df9969f773d8ece (commit)
via ddb029a7fcd34466b851fb043c52cfce53cd7d2f (commit)
via f13ef045607ca24a44d3d2c0bfd1d9570c4d65a1 (commit)
from e8c395d392fc60ca3dc474c3ea51abacdf887f6e (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=f3caacfa432aa1d40c0ba1ca2f30a64836c74af6
commit f3caacfa432aa1d40c0ba1ca2f30a64836c74af6
Author: Franck Villaume <[email protected]>
Date: Tue Apr 13 19:42:55 2021 +0200
sync CHANGES
diff --git a/src/CHANGES b/src/CHANGES
index b7f2776..d8409bd 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,4 +1,7 @@
FusionForge 6.1.1:
+* Admin: fix sorting in full user list [#927] (Ralf Habacker)
+* Bin: add pluginList in forge cli [#928] (Ralf Habacker)
+* Bin: fix forge help pages [#929] (Ralf Habacker)
* Install System: add support for OpenSuSE Leap 15.x [#930] (Ralf Habacker)
* Search Engine: fix PHP notice in SearchManager.class.php [#908] (TrivialDev)
* Plugin Scmhook: fix scmhook commitEmail for scmhg broken [#903] (TrivialDev)
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2ac5cf674635ca1b04ac34965df9969f773d8ece
commit 2ac5cf674635ca1b04ac34965df9969f773d8ece
Author: Ralf Habacker <[email protected]>
Date: Mon Mar 22 11:40:23 2021 +0100
src/bin/forge_get_config: fix script name in help page
diff --git a/src/bin/forge_get_config b/src/bin/forge_get_config
index 4e99a23..dcef578 100755
--- a/src/bin/forge_get_config
+++ b/src/bin/forge_get_config
@@ -65,12 +65,12 @@ if (count ($argv) == 3) {
echo "$v\n" ;
}
} else {
- echo "Usage: .../forge-get-config <variable> [ <section> ]
-For instance: .../forge-get-config web_host
- .../forge-get-config repos_path scmsvn
+ echo "Usage: .../forge_get_config <variable> [ <section> ]
+For instance: .../forge_get_config web_host
+ .../forge_get_config repos_path scmsvn
-Or: .../forge-get-config list-all-variables, for all variables
- .../forge-get-config list-all-variables-values, for all
variables and their values
+Or: .../forge_get_config list-all-variables, for all variables
+ .../forge_get_config list-all-variables-values, for all
variables and their values
" ;
exit (1) ;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ddb029a7fcd34466b851fb043c52cfce53cd7d2f
commit ddb029a7fcd34466b851fb043c52cfce53cd7d2f
Author: Ralf Habacker <[email protected]>
Date: Wed Mar 10 14:56:25 2021 +0100
src/bin/forge: Add command 'pluginList' to get a list of all plugins
diff --git a/src/bin/forge b/src/bin/forge
index 3e8e4b9..a08ad8c 100755
--- a/src/bin/forge
+++ b/src/bin/forge
@@ -56,6 +56,10 @@ class CliActions {
echo "Use: .../forge pluginDeactivate
<pluginName>\n";
echo "to deactivate the <pluginName> plugin\n";
break;
+ case 'pluginList':
+ echo "Use: .../forge pluginList\n";
+ echo "to get a list of all available plugins\n";
+ break;
case 'artifactDump':
echo "Use: .../forge artifactDump <aid>
[json|raw]\n";
echo "to dump an artifact from a specific
tracker of a project.\n";
@@ -196,6 +200,12 @@ class CliActions {
$pm->deactivate($name);
}
+ function pluginList() {
+ $pm = plugin_manager_get_object();
+ foreach($pm->getPlugins() as $plugin)
+ echo "$plugin\n";
+ }
+
function getZipDump($file, $format = 'json') {
$stream = $this->loadFile($file, $format);
if (!$stream) {
@@ -1725,17 +1735,22 @@ if (count($argv) >= 3) {
$j++;
}
}
+} else if (count($argv) >= 2) {
+ $action = $argv[1];
+ unset($name);
} else {
$action = 'help';
- $name = '';
+ unset($name);
}
$ctl = new CliActions();
if (method_exists($ctl, $action)) {
if (isset($params[0])) {
$ctl->$action($name, $params[0]);
- } else {
+ } else if(isset($name)) {
$ctl->$action($name);
+ } else {
+ $ctl->$action();
}
} else {
$ctl->help();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f13ef045607ca24a44d3d2c0bfd1d9570c4d65a1
commit f13ef045607ca24a44d3d2c0bfd1d9570c4d65a1
Author: Ralf Habacker <[email protected]>
Date: Wed Mar 24 12:31:22 2021 +0100
Fix sorting in admin user list
The column required for ordering cannot be provided as parameter as it
would be added as literal string, which is not expected.
For details see
https://stackoverflow.com/questions/27908977/how-to-use-parametric-order-by-with-pg-prepare-pg-execute
diff --git a/src/www/admin/userlist.php b/src/www/admin/userlist.php
index 0a29df0..73c13fb 100644
--- a/src/www/admin/userlist.php
+++ b/src/www/admin/userlist.php
@@ -228,7 +228,7 @@ if ($usingplugin) {
$qpa = db_construct_qpa($qpa, ' AND status = $1',
array($status));
$filter .= '&status='.$status;
}
- $qpa = db_construct_qpa($qpa, ' ORDER BY $1', array($sort_order));
+ $qpa = db_construct_qpa($qpa, ' ORDER BY '.$sort_order);
$res = db_query_qpa($qpa, $paging, $start);
$list_id = util_result_column_to_array($res, 0);
echo html_e('h2', array(), $msg);
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 3 +++
src/bin/forge | 19 +++++++++++++++++--
src/bin/forge_get_config | 10 +++++-----
src/www/admin/userlist.php | 2 +-
4 files changed, 26 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
