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 9b3d1ad09e3edc5d823032ea67913dd76578e31c (commit)
from 08452326446c351e9eca8f0dbe71353a17129559 (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=9b3d1ad09e3edc5d823032ea67913dd76578e31c
commit 9b3d1ad09e3edc5d823032ea67913dd76578e31c
Author: Franck Villaume <[email protected]>
Date: Tue Feb 20 12:42:41 2018 +0000
scmhook: implement fix for scmcvs & scmgit
diff --git a/src/plugins/scmhook/common/scmhookPlugin.class.php
b/src/plugins/scmhook/common/scmhookPlugin.class.php
index 420d773..e6ae240 100644
--- a/src/plugins/scmhook/common/scmhookPlugin.class.php
+++ b/src/plugins/scmhook/common/scmhookPlugin.class.php
@@ -486,7 +486,7 @@ project independently.");
$cells = array();
$cells[][] = $repository.html_e('input',
array('type' => 'hidden', 'name' => 'repository['.$repository.'][]'));
foreach ($hooksPostReceive as $hookPostReceive)
{
- $attr = array('type' => 'checkbox');
+ $attr = array('type' => 'checkbox',
'name' => 'repository['.$repository.'][]', 'value' =>
$hookPostReceive->getLabel().'_'.$hookPostReceive->getClassname());
if
((!empty($hookPostReceive->onlyGlobalAdmin) && !Permission::isGlobalAdmin()) ||
!$hookPostReceive->isAvailable()) {
$attr = array_merge($attr,
array('disabled' => 'disabled'));
if
(!$hookPostReceive->isAvailable()) {
@@ -505,12 +505,12 @@ project independently.");
$val = ($values[$pname]
!= null) ? $values[$pname] : $pconf['default'];
switch($pconf['type']) {
case 'emails':
- $content =
html_e('input', array('type' => 'text','title' => $pconf['description'], 'name'
=> 'scmgit_{'.$hookPostReceive->getClassname().'}_'.$pname.'[]', 'value' =>
$val, 'size' => 40));
+ $content =
html_e('input', array('type' => 'text','title' => $pconf['description'], 'name'
=>
$hookPostReceive->getLabel().'_'.$hookPostReceive->getClassname().'['.$repository.']['.$pname.']',
'value' => $val, 'size' => 40));
break;
}
}
}
- $cells[][] = html_e('input',
array('type' => 'checkbox', 'name' =>
$hookPostReceive->getLabel().'_'.$hookPostReceive->getClassname().'[]', 'value'
=> $repository)).$content;
+ $cells[][] = html_e('input',
$attr).$content;
}
echo $HTML->multiTableRow(array(), $cells);
}
@@ -553,7 +553,7 @@ project independently.");
$cells = array();
$cells[][] = $repository.html_e('input',
array('type' => 'hidden', 'name' => 'repository['.$repository.'][]'));
foreach ($hooksPostCommit as $hookPostCommit) {
- $attr = array('type' => 'checkbox');
+ $attr = array('type' => 'checkbox',
'name' => 'repository['.$repository.'][]', 'value' =>
$hookPostCommit->getLabel().'_'.$hookPostCommit->getClassname());
if
((!empty($hookPostCommit->onlyGlobalAdmin) && !Permission::isGlobalAdmin()) ||
!$hookPostCommit->isAvailable()) {
$attr = array_merge($attr,
array('disabled' => 'disabled'));
if
(!$hookPostCommit->isAvailable()) {
@@ -563,7 +563,7 @@ project independently.");
if
(isset($hooksEnabled['scmcvs'][$repository]) &&
in_array($hookPostCommit->getName(), $hooksEnabled['scmcvs'][$repository])) {
$attr = array_merge($attr,
array('checked' => 'checked'));
}
- $cells[][] = html_e('input',
array('type' => 'checkbox', 'name' =>
$hookPostCommit->getLabel().'_'.$hookPostCommit->getClassname().'[]', 'value'
=> $repository));
+ $cells[][] = html_e('input', $attr);
}
echo $HTML->multiTableRow(array(), $cells);
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmhook/common/scmhookPlugin.class.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
