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 5a6b5cd9ba168f458f3605b85ece2ab787d3a9b0 (commit)
via 7858cdeaf2acfc5fc9e6d9d3ac6f828702458cf1 (commit)
via 88d08cca09212853ff83da594ed51d96084b5519 (commit)
from 6ac73e71117ecf506c91ab60fd7f4968f772cc12 (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=5a6b5cd9ba168f458f3605b85ece2ab787d3a9b0
commit 5a6b5cd9ba168f458f3605b85ece2ab787d3a9b0
Author: Franck Villaume <[email protected]>
Date: Sun Feb 11 16:23:30 2018 +0100
remove unused var
diff --git a/src/common/scm/SCMFactory.class.php
b/src/common/scm/SCMFactory.class.php
index d570832..64b931b 100644
--- a/src/common/scm/SCMFactory.class.php
+++ b/src/common/scm/SCMFactory.class.php
@@ -31,10 +31,8 @@ class SCMFactory extends FFError {
* @var array scms.
*/
var $scms;
- var $fetched_rows;
function __construct() {
-
parent::__construct();
if (!forge_get_config('use_scm')) {
$this->setError('SCMFactory::sys_use_scm');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7858cdeaf2acfc5fc9e6d9d3ac6f828702458cf1
commit 7858cdeaf2acfc5fc9e6d9d3ac6f828702458cf1
Author: Franck Villaume <[email protected]>
Date: Sun Feb 11 16:04:22 2018 +0100
SCM index page: support allow_multiple_scm option
diff --git a/src/common/include/SCMPlugin.class.php
b/src/common/include/SCMPlugin.class.php
index 3ca906a..d574086 100644
--- a/src/common/include/SCMPlugin.class.php
+++ b/src/common/include/SCMPlugin.class.php
@@ -196,6 +196,9 @@ abstract class SCMPlugin extends Plugin {
}
session_require_perm('scm', $project->getID(), 'read');
+ if (forge_get_config('allow_multiple_scm') &&
($params['allow_multiple_scm'] > 1)) {
+ echo html_ao('div', array('id' =>
'tabber-'.$this->name, 'class' => 'tabbertab'));
+ }
// Table for summary info
echo $HTML->listTableTop();
$cells = array();
@@ -231,6 +234,9 @@ abstract class SCMPlugin extends Plugin {
$cells[] = array($cellContent, 'style' => 'width:35%', 'class'
=> 'top');
echo $HTML->multiTableRow(array('class' => 'top'), $cells);
echo $HTML->listTableBottom();
+ if (forge_get_config('allow_multiple_scm') &&
($params['allow_multiple_scm'] > 1)) {
+ echo html_ac(html_ap() - 1);
+ }
}
function printBrowserPage($params) {
diff --git a/src/www/scm/index.php b/src/www/scm/index.php
index 4b0799c..7368715 100644
--- a/src/www/scm/index.php
+++ b/src/www/scm/index.php
@@ -3,7 +3,7 @@
* SCM Frontend
*
* Copyright 2004 (c) Roland Mas, Tim Perdue -GForge LLC
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2018, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -25,6 +25,8 @@ require_once '../env.inc.php';
require_once $gfcommon.'include/pre.php';
require_once $gfwww.'scm/include/scm_utils.php';
+global $HTML;
+
$group_id = getIntFromRequest("group_id");
$group = group_get_object($group_id);
if (!$group || !is_object($group)) {
@@ -34,25 +36,39 @@ if (!$group || !is_object($group)) {
session_require_perm('scm', $group_id, 'read');
// Check if there is an associated scm plugin and issue a warning if none.
-$scm_plugin = '';
+$scm_plugins = array();
foreach (PluginManager::instance()->getPlugins() as $p) {
$plugin = PluginManager::instance()->GetPluginObject($p);
if (isset($plugin->provides['scm']) && $plugin->provides['scm'] &&
$group->usesPlugin($p)) {
- $scm_plugin = $p;
+ $scm_plugins[] = $plugin;
}
}
-if (!$scm_plugin) {
+if (count($scm_plugins) == 0) {
$warning_msg = _("This project has no associated Source Code Management
tool defined, please configure one using the Administration submenu.");
}
-scm_header(array('title'=> sprintf(_('Source Code Repository for %s'),
$group->getPublicName()),'group'=>$group_id,'inframe'=>0));
+scm_header(array('title'=> sprintf(_('Source Code Repository for %s'),
$group->getPublicName()), 'group' => $group_id, 'inframe' => 0));
plugin_hook("blocks", "scm index");
+if (forge_get_config('allow_multiple_scm') && (count($scm_plugins) > 1)) {
+ $elementsLi = array();
+ foreach ($scm_plugins as $scm_plugin) {
+ $elementsLi[] = array('content' =>
util_make_link('#tabber-'.$scm_plugin->name, $scm_plugin->text, false, true));
+ }
+ echo html_ao('div', array('id' => 'tabberid'));
+ echo $HTML->html_list($elementsLi);
+}
+
$hook_params = array();
$hook_params['group_id'] = $group_id;
+$hook_params['allow_multiple_scm'] = count($scm_plugins);
plugin_hook("scm_page", $hook_params);
+if (forge_get_config('allow_multiple_scm') && (count($scm_plugins) > 1)) {
+ echo html_ac(html_ap() - 1);
+}
+
echo html_e('script', array('type'=>'text/javascript'),
'//<![CDATA['."\n".'jQuery("[id^=tabber]").tabs();'."\n".'//]]>');
scm_footer();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=88d08cca09212853ff83da594ed51d96084b5519
commit 88d08cca09212853ff83da594ed51d96084b5519
Author: Franck Villaume <[email protected]>
Date: Sun Feb 11 16:03:49 2018 +0100
double space -> simple space
diff --git a/src/www/scm/admin/index.php b/src/www/scm/admin/index.php
index 2522975..7b13993 100644
--- a/src/www/scm/admin/index.php
+++ b/src/www/scm/admin/index.php
@@ -165,7 +165,7 @@ $hook_params['group_id'] = $group_id ;
$SCMFactory = new SCMFactory();
$scm_plugins = $SCMFactory->getSCMs();
if (count($scm_plugins) != 0) {
- echo $HTML->information(_('Note: Changing the repository does not
delete the previous repository. It only affects the information displayed
under the SCM tab.'));
+ echo $HTML->information(_('Note: Changing the repository does not
delete the previous repository. It only affects the information displayed under
the SCM tab.'));
if (count($scm_plugins) == 1) {
$myPlugin = plugin_get_object($scm_plugins[0]);
echo html_e('input', array('type' => 'hidden', 'name' =>
'scmengine[]', 'value' => $myPlugin->name));
-----------------------------------------------------------------------
Summary of changes:
src/common/include/SCMPlugin.class.php | 6 ++++++
src/common/scm/SCMFactory.class.php | 2 --
src/www/scm/admin/index.php | 2 +-
src/www/scm/index.php | 26 +++++++++++++++++++++-----
4 files changed, 28 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
