[Fusionforge-commits] FusionForge branch master updated. 6.0.4-1138-gdb054f0

Franck Villaume nerville at libremir.placard.fr.eu.org
Wed Nov 9 13:25:50 CET 2016


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  db054f0d17b208671ee89898569adacb09657326 (commit)
      from  a0d3a75c746213ed9acb16ab67a38e96c8e75e44 (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=db054f0d17b208671ee89898569adacb09657326

commit db054f0d17b208671ee89898569adacb09657326
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Nov 9 13:25:45 2016 +0100

    display number of association in document association tab title

diff --git a/src/common/docman/views/editfile.php b/src/common/docman/views/editfile.php
index 8409fce..e641504 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -71,7 +71,7 @@ if (forge_get_config('use_object_associations')) {
 	echo html_ao('div', array('id' => 'tabbereditfile'));
 	$elementsLi = array();
 	$elementsLi[] = array('content' => util_make_link('#tabbereditfile-version', _('Edit Versions'), array('title' => _('View/Add/Remove document version.')), true));
-	$elementsLi[] = array('content' => util_make_link('#tabbereditfile-association', _('Associations'), array('title' => _('Add/Remove associated objects.')), true));
+	$elementsLi[] = array('content' => util_make_link('#tabbereditfile-association', _('Associations'), array('id' => 'associationtab', 'title' => _('Add/Remove associated objects.')), true));
 	echo $HTML->html_list($elementsLi);
 	echo html_ao('div', array('id' => 'tabbereditfile-version', 'class' => 'tabbertab'));
 }
diff --git a/src/www/docman/scripts/DocManController.js b/src/www/docman/scripts/DocManController.js
index c714a62..9ae822a 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -451,6 +451,9 @@ DocManListFileController.prototype =
 					jQuery('#tabbereditfile-association > span').remove();
 					jQuery('#tabbereditfile-association').prepend(data.html);
 				}
+				if (typeof data.htmltab != 'undefined') {
+					jQuery('#associationtab').text(data.htmltab);
+				}
 			}, this));
 
 		jQuery('#editdocdata').attr('action', this.docparams.action);

-----------------------------------------------------------------------

Summary of changes:
 src/common/docman/views/editfile.php       | 2 +-
 src/www/docman/scripts/DocManController.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list