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, master has been updated
via 28ed358b8008ba53b0d20858792ca02536b2c0ff (commit)
via 3fc758c37722cef9fb9f5eb0473e6b0e395d1418 (commit)
via 11774fb3eb2dfb4c8fc8ec737054830ebc8927d9 (commit)
from 9f2030b08815f6e6a03c1c31a3859046860b7cdf (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=28ed358b8008ba53b0d20858792ca02536b2c0ff
commit 28ed358b8008ba53b0d20858792ca02536b2c0ff
Author: Franck Villaume <[email protected]>
Date: Sat May 1 11:37:21 2021 +0200
fix wrong var
diff --git a/src/common/include/Group.class.php
b/src/common/include/Group.class.php
index 37d9a39..78517ae 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -2407,7 +2407,7 @@ class Group extends FFError {
$this->setError(_('Could Not Get Role'));
return false;
} elseif ($newrole->isError()) {
- $this->setError(_('Role')._(':
').$role->getErrorMessage());
+ $this->setError(_('Role')._(':
').$newrole->getErrorMessage());
return false;
} elseif ($newrole->getHomeProject() == NULL
|| $newrole->getHomeProject()->getID() !=
$this->getID()) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3fc758c37722cef9fb9f5eb0473e6b0e395d1418
commit 3fc758c37722cef9fb9f5eb0473e6b0e395d1418
Author: Franck Villaume <[email protected]>
Date: Sat May 1 11:36:12 2021 +0200
remove unreachable code
diff --git a/src/common/include/Group.class.php
b/src/common/include/Group.class.php
index e09dceb..37d9a39 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -1147,14 +1147,6 @@ class Group extends FFError {
} else {
return false;
}
-
- $hook_params = array();
- $hook_params['group'] = $this;
- $hook_params['group_id'] = $this->getID();
- $hook_params['group_homepage'] = $this->getHomePage();
- $hook_params['group_name'] = $this->getPublicName();
- $hook_params['group_description'] = $this->getDescription();
- plugin_hook ("group_update", $hook_params);
}
/**
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=11774fb3eb2dfb4c8fc8ec737054830ebc8927d9
commit 11774fb3eb2dfb4c8fc8ec737054830ebc8927d9
Author: Franck Villaume <[email protected]>
Date: Sat May 1 11:34:35 2021 +0200
fix wrong parameter number
diff --git a/src/common/include/FFObject.class.php
b/src/common/include/FFObject.class.php
index b4a27f5..4d837ae 100644
--- a/src/common/include/FFObject.class.php
+++ b/src/common/include/FFObject.class.php
@@ -139,10 +139,10 @@ class FFObject extends FFError {
}
}
- function getLinkObject($objectId, $objectRefId, $objectType) {
+ function getLinkObject($objectId, $objectType) {
switch ($objectType) {
case 'Document':
- return _documentid2url($objectId, $objectRefId);
+ return _documentid2url($objectId);
break;
case 'Artifact':
return _artifactid2url($objectId);
@@ -325,7 +325,7 @@ class FFObject extends FFError {
$cells = array();
$cells[][] = _('To');
$cells[][] = $objectType;
- $cells[][] =
$this->getLinkObject($objectId, $objectRefId, $objectType);
+ $cells[][] =
$this->getLinkObject($objectId, $objectType);
if ($url !== false) {
$cells[][] =
util_make_link($url.'&link=to&objecttype='.$objectType.'&objectrefid='.$objectRefId.'&objectid='.$objectId,
$HTML->getDeletePic(_('Remove this association'), _('Remove this
association')));
}
@@ -352,7 +352,7 @@ class FFObject extends FFError {
$cells = array();
$cells[][] = _('From');
$cells[][] = $objectType;
- $cells[][] =
$this->getLinkObject($objectId, $objectRefId, $objectType);
+ $cells[][] =
$this->getLinkObject($objectId, $objectType);
if ($url !== false) {
$cells[][] =
util_make_link($url.'&link=from&objecttype='.$objectType.'&objectrefid='.$objectRefId.'&objectid='.$objectId,
$HTML->getDeletePic(_('Remove this association'), _('Remove this
association')));
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/FFObject.class.php | 8 ++++----
src/common/include/Group.class.php | 10 +---------
2 files changed, 5 insertions(+), 13 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
