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 77678810b6f354ff145bb151294d967f34885838 (commit)
from fed4bb133e583e530d18fc18fbe38855c4df64dc (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=77678810b6f354ff145bb151294d967f34885838
commit 77678810b6f354ff145bb151294d967f34885838
Author: Franck Villaume <[email protected]>
Date: Mon Oct 24 16:21:13 2016 +0200
fix remove association from
diff --git a/src/common/include/FFObject.class.php
b/src/common/include/FFObject.class.php
index c43d981..bccc39b 100644
--- a/src/common/include/FFObject.class.php
+++ b/src/common/include/FFObject.class.php
@@ -244,7 +244,7 @@ class FFObject extends FFError {
if
(isset($this->associatedFromArray[$objectType][$objectRefId]) &&
in_array($objectId, $this->associatedFromArray[$objectType][$objectRefId])) {
$res = db_query_params('DELETE FROM
fusionforge_object_assiociation WHERE from_id = $1 AND from_object_type = $2
AND to_object_type = $3
AND to_id = $4',
- array($objectType, $objectId,
$this->getID(), $this->getRealClass($this)));
+ array($objectId, $objectType,
$this->getRealClass($this), $this->getID()));
if ($res) {
unset($this->associatedFromArray[$objectType][$objectRefId][$objectId]);
return true;
@@ -312,7 +312,7 @@ class FFObject extends FFError {
$tabletop = array('',
_('Associated Object'), _('Associated Object ID'));
$classth = array('',
'', '');
if ($url !== false) {
-/bin/bash: q: command not found
+ $content .=
html_e('p', array(), _('Remove all associations')._(':
').util_make_link($url.'&link=any', $HTML->getDeletePic(_('Remove all
associations'), _('Remove all associations'))));
$tabletop[] =
_('Actions');
$classth[] =
'unsortable';
}
@@ -325,7 +325,7 @@ class FFObject extends FFError {
$cells[][] =
$objectType;
$cells[][] =
$this->getLinkObject($objectId, $objectRefId, $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')));
+ $cells[][] =
util_make_link($url.'&link=from&objecttype='.$objectType.'&objectrefid='.$objectRefId.'&objectid='.$objectId,
$HTML->getDeletePic(_('Remove this association'), _('Remove this
association')));
}
$content .=
$HTML->multiTableRow(array(), $cells);
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/FFObject.class.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
