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 6fab0bb1c43aea017a9cc62f0bca7948e3b7fe3f (commit)
via e4b5c3a8ec938ddf8857bb4f45aba5b578fb6a18 (commit)
from 6f20431a2846caedb4d388c301fad80f8f337e4a (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=6fab0bb1c43aea017a9cc62f0bca7948e3b7fe3f
commit 6fab0bb1c43aea017a9cc62f0bca7948e3b7fe3f
Author: Franck Villaume <[email protected]>
Date: Sun Feb 7 20:37:54 2016 +0100
docman: fix missing param in documentgroup_get_object
diff --git a/src/common/docman/DocumentGroup.class.php
b/src/common/docman/DocumentGroup.class.php
index 09c7d37..991d9e1 100644
--- a/src/common/docman/DocumentGroup.class.php
+++ b/src/common/docman/DocumentGroup.class.php
@@ -188,7 +188,7 @@ class DocumentGroup extends Error {
if ($parent_doc_group) {
/* update the parent */
- $parentDg = documentgroup_get_object($parent_doc_group);
+ $parentDg = documentgroup_get_object($parent_doc_group,
$this->Group->getID());
$parentDg->update($parentDg->getName(),
$parentDg->getParentID(), 1);
}
$this->sendNotice(true);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e4b5c3a8ec938ddf8857bb4f45aba5b578fb6a18
commit e4b5c3a8ec938ddf8857bb4f45aba5b578fb6a18
Author: Franck Villaume <[email protected]>
Date: Sun Feb 7 20:28:04 2016 +0100
docman: remove debug console.log
diff --git a/src/www/docman/scripts/DocManController.js
b/src/www/docman/scripts/DocManController.js
index 1e07661..a38b633 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -78,19 +78,15 @@ DocManListFileController.prototype =
} else {
var fixwidth = -40;
if (jQuery('#editFile').length >= 1) {
- console.log(jQuery('#editFile').outerHeight());
fixwidth += jQuery('#editFile').outerHeight() -
jQuery('[aria-describedby="editFile"]').outerHeight();
- console.log(fixwidth);
}
if (jQuery('#notifyUsers').length >= 1) {
- console.log(jQuery('#editFile').outerHeight());
fixwidth +=
jQuery('#notifyUsers').outerHeight() -
jQuery('[aria-describedby="notifyUsers"]').outerHeight();
- console.log(fixwidth);
}
var totalRightHeight = 0;
this.params.divRight.children().each(function() {
if (jQuery(this).is(':visible')) {
- totalRightHeight =
totalRightHeight + jQuery(this).outerHeight();
+ totalRightHeight +=
jQuery(this).outerHeight();
}
});
totalRightHeight -= fixwidth;
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentGroup.class.php | 2 +-
src/www/docman/scripts/DocManController.js | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
