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 8a5ffd43354222fd32a6c66ce274e8b4f24c5c02 (commit)
via c58edb1e93ce1af5d90d17aaa335877a0ef8765e (commit)
from ebbbf9a38c4fd63057ccd9bf5e5607cdcba8f2e2 (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=8a5ffd43354222fd32a6c66ce274e8b4f24c5c02
commit 8a5ffd43354222fd32a6c66ce274e8b4f24c5c02
Author: Franck Villaume <[email protected]>
Date: Sat Oct 21 10:28:00 2017 +0200
final fix for double slash
diff --git a/src/common/docman/views/listfile.php
b/src/common/docman/views/listfile.php
index 1020a92..0c459fc 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -184,7 +184,7 @@ if ($DocGroupName) {
if ($childgroup_id) {
$headerPath .= _('Subproject')._(':
').util_make_link('/docman/?group_id='.$g->getID(), $g->getPublicName()).'::';
}
- $headerPath .= html_e('i', array(), $dgpath.'/'.$DocGroupName, false);
+ $headerPath .= html_e('i', array(), preg_replace('/\/\//','/',
$dgpath.'/'.$DocGroupName), false);
echo html_e('h2', array('class' => 'docman_h2'), $headerPath, false);
$max = ($nbDocs > ($start + $paging)) ? ($start + $paging) : $nbDocs;
echo $HTML->paging_top($start, $paging, $nbDocs, $max, $redirecturl,
array('style' => 'display:inline-block'));
diff --git a/src/common/docman/views/listtrashfile.php
b/src/common/docman/views/listtrashfile.php
index 9df0600..64dad2a 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -134,7 +134,7 @@ if ($DocGroupName) {
if ($childgroup_id) {
$headerPath .= _('Subproject')._(':
').util_make_link('/docman/?group_id='.$g->getID(), $g->getPublicName()).'::';
}
- $headerPath .= html_e('i', array(), $dgpath.'/'.$DocGroupName,
false).' ';
+ $headerPath .= html_e('i', array(), preg_replace('/\/\//','/',
$dgpath.'/'.$DocGroupName), false).' ';
echo html_e('h2', array('class' => 'docman_h2'), $headerPath, false);
if ($DocGroupName != '.trash') {
echo util_make_link('#', $HTML->getConfigurePic(_('Edit this
folder'), 'edit'), array('id' => 'docman-editdirectory', 'onclick' =>
'javascript:controllerListFile.toggleEditDirectoryView()'), true);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c58edb1e93ce1af5d90d17aaa335877a0ef8765e
commit c58edb1e93ce1af5d90d17aaa335877a0ef8765e
Author: Franck Villaume <[email protected]>
Date: Sat Oct 21 10:23:39 2017 +0200
docman: less code, fix double slash in path
diff --git a/src/common/docman/DocumentGroup.class.php
b/src/common/docman/DocumentGroup.class.php
index 12564f6..eddfa6a 100644
--- a/src/common/docman/DocumentGroup.class.php
+++ b/src/common/docman/DocumentGroup.class.php
@@ -708,6 +708,7 @@ class DocumentGroup extends FFError {
$returnPath .= '/'.$this->getName();
}
}
+ $returnPath = preg_replace('/\/\//','/', $returnPath);
return $returnPath;
}
diff --git a/src/common/docman/views/listfile.php
b/src/common/docman/views/listfile.php
index 949a7f2..1020a92 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -7,7 +7,7 @@
* Copyright (C) 2010 Alcatel-Lucent
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2012-2016, Franck Villaume - TrivialDev
+ * Copyright 2012-2017, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -184,9 +184,7 @@ if ($DocGroupName) {
if ($childgroup_id) {
$headerPath .= _('Subproject')._(':
').util_make_link('/docman/?group_id='.$g->getID(), $g->getPublicName()).'::';
}
- $generalpath = $dgpath.'/'.$DocGroupName;
- $generalpath = preg_replace('/\/\//','/', $generalpath);
- $headerPath .= html_e('i', array(), $generalpath, false);
+ $headerPath .= html_e('i', array(), $dgpath.'/'.$DocGroupName, false);
echo html_e('h2', array('class' => 'docman_h2'), $headerPath, false);
$max = ($nbDocs > ($start + $paging)) ? ($start + $paging) : $nbDocs;
echo $HTML->paging_top($start, $paging, $nbDocs, $max, $redirecturl,
array('style' => 'display:inline-block'));
diff --git a/src/common/docman/views/listtrashfile.php
b/src/common/docman/views/listtrashfile.php
index d491111..9df0600 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -6,7 +6,7 @@
* Copyright 2002-2003, Tim Perdue/GForge, LLC
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2011-2016, Franck Villaume - TrivialDev
+ * Copyright 2011-2017, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -134,9 +134,7 @@ if ($DocGroupName) {
if ($childgroup_id) {
$headerPath .= _('Subproject')._(':
').util_make_link('/docman/?group_id='.$g->getID(), $g->getPublicName()).'::';
}
- $generalpath = $dgpath.'/'.$DocGroupName;
- $generalpath = preg_replace('/\/\//','/', $generalpath);
- $headerPath .= html_e('i', array(), $generalpath, false).' ';
+ $headerPath .= html_e('i', array(), $dgpath.'/'.$DocGroupName,
false).' ';
echo html_e('h2', array('class' => 'docman_h2'), $headerPath, false);
if ($DocGroupName != '.trash') {
echo util_make_link('#', $HTML->getConfigurePic(_('Edit this
folder'), 'edit'), array('id' => 'docman-editdirectory', 'onclick' =>
'javascript:controllerListFile.toggleEditDirectoryView()'), true);
diff --git a/src/common/widget/Widget_ProjectLatestDocuments.class.php
b/src/common/widget/Widget_ProjectLatestDocuments.class.php
index 6498177..8b81e25 100644
--- a/src/common/widget/Widget_ProjectLatestDocuments.class.php
+++ b/src/common/widget/Widget_ProjectLatestDocuments.class.php
@@ -91,13 +91,11 @@ class Widget_ProjectLatestDocuments extends Widget {
$doc =& $df->Documents[$key][$i];
$updatedate = $doc->getUpdated();
$createdate = $doc->getCreated();
- $realdate = ($updatedate >=
$createdate) ? $updatedate : $createdate;
$filename = $doc->getFileName();
$filetype = $doc->getFileType();
$docid = $doc->getID();
$docgroup = $doc->getDocGroupID();
$ndg =
documentgroup_get_object($docgroup, $group_id);
- $path = $ndg->getPath(true, true);
switch ($filetype) {
case "URL": {
$docurl =
util_make_link($filename, html_image($doc->getFileTypeImage(), 22, 22,
array('alt'=>$doc->getFileType())), array(), true);
@@ -108,12 +106,12 @@ class Widget_ProjectLatestDocuments extends Widget {
}
}
$cells = array();
- $cells[][] = date(_('Y-m-d'),
$realdate);
+ $cells[][] = date(_('Y-m-d'),
($updatedate >= $createdate) ? $updatedate : $createdate);
$cells[][] = $docurl;
$cells[][] = $filename;
$cells[] = array($doc->getName(),
'title' => $doc->getDescription());
$cells[][] =
util_display_user($doc->getCreatorUserName(), $doc->getCreatorID(),
$doc->getCreatorRealName());
- $cells[][] = $path;
+ $cells[][] = $ndg->getPath(true, true);
if (session_loggedin()) {
$cells[][] =
$doc->getStateName();
$action = '';
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentGroup.class.php | 1 +
src/common/docman/views/listfile.php | 6 ++----
src/common/docman/views/listtrashfile.php | 6 ++----
src/common/widget/Widget_ProjectLatestDocuments.class.php | 6 ++----
4 files changed, 7 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
