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 9915e22297d30865a8a77347054517f772518f3a (commit)
via 7d34faba830b7fb97e9b9bd5e1912ea08a8120ee (commit)
via 901532a520b1c71a9fad1625fae753ad24c33202 (commit)
via e53726fd7ff939befece2080c53f6b1a3b32c897 (commit)
via 9f08bdec518cc72a6f7baf5d7f9f4786c688b8fb (commit)
via 63cdee82032761aff065c7207793edb2792977c7 (commit)
from 656983040dee024ec1a05af9fa3c91e22e318d1a (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=9915e22297d30865a8a77347054517f772518f3a
commit 9915e22297d30865a8a77347054517f772518f3a
Author: Franck Villaume <[email protected]>
Date: Fri May 13 20:30:03 2016 +0200
docman edit file action: fix php warning
diff --git a/src/common/docman/actions/editfile.php
b/src/common/docman/actions/editfile.php
index 4b0b89d..5e24a01 100644
--- a/src/common/docman/actions/editfile.php
+++ b/src/common/docman/actions/editfile.php
@@ -5,7 +5,7 @@
* Copyright 2000, Quentin Cregan/Sourceforge
* Copyright 2002-2003, Tim Perdue/GForge, LLC
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012,2015, Franck Villaume - TrivialDev
+ * Copyright 2012,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -79,6 +79,7 @@ if ($d->isError()) {
$sanitizer = new TextSanitizer();
$details = $sanitizer->SanitizeHtml($details);
+$data = '';
if (($editor) && ($d->getFileData() != $details) && (!$uploaded_data['name']))
{
$filename = $d->getFileName();
$datafile = tempnam("/tmp", "docman");
@@ -103,7 +104,6 @@ if (($editor) && ($d->getFileData() != $details) &&
(!$uploaded_data['name'])) {
$filetype = $uploaded_data['type'];
}
} elseif ($file_url) {
- $data = '';
$filename = $file_url;
$filetype = 'URL';
} else {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7d34faba830b7fb97e9b9bd5e1912ea08a8120ee
commit 7d34faba830b7fb97e9b9bd5e1912ea08a8120ee
Author: Franck Villaume <[email protected]>
Date: Fri May 13 20:29:31 2016 +0200
docman listtrashfile view: sync with listfile view
diff --git a/src/common/docman/views/listtrashfile.php
b/src/common/docman/views/listtrashfile.php
index 16639ed..76eee35 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -72,10 +72,11 @@ $d_arr =& $df->getDocuments();
$nested_docs = array();
$DocGroupName = 0;
-
+$dgpath = '';
if ($dirid) {
$ndg = documentgroup_get_object($dirid, $g->getID());
$DocGroupName = $ndg->getName();
+ $dgpath = $ndg->getPath(true, false);
if (!$DocGroupName) {
$error_msg = $g->getErrorMessage();
session_redirect($baseredirecturl);
@@ -129,14 +130,21 @@ jQuery(document).ready(function() {
echo html_ac(html_ap() - 1);
if ($DocGroupName) {
- $content = _('Document Folder')._(': ').html_e('i', array(),
$DocGroupName, false).' ';
+ $headerPath = '';
+ 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).' ';
+ echo html_e('h2', array('class' => 'docman_h2'), $headerPath, false);
if ($DocGroupName != '.trash') {
- $content .= util_make_link('#', $HTML->getConfigurePic(_('Edit
this folder'), 'edit'), array('id' => 'docman-editdirectory', 'onclick' =>
'javascript:controllerListTrash.toggleEditDirectoryView()'), true);
- $content .= util_make_link($redirecturl.'&action=deldir',
$HTML->getRemovePic(_('Delete permanently this folder and his content.'),
'deldir'), array('id' => 'docman-deletedirectory'));
+ echo util_make_link('#', $HTML->getConfigurePic(_('Edit this
folder'), 'edit'), array('id' => 'docman-editdirectory', 'onclick' =>
'javascript:controllerListTrash.toggleEditDirectoryView()'), true);
+ echo util_make_link($redirecturl.'&action=deldir',
$HTML->getRemovePic(_('Delete permanently this folder and his content.'),
'deldir'), array('id' => 'docman-deletedirectory'));
}
- echo html_e('h3', array('class' => 'docman_h3'), $content, false);
+
echo html_ao('div', array('class' => 'docman_div_include hide', 'id' =>
'editdocgroup'));
- echo html_e('h4', array('class' => 'docman_h4'), _('Edit this folder'),
false);
+ echo html_e('h3', array('class' => 'docman_h3'), _('Edit this folder'),
false);
include ($gfcommon.'docman/views/editdocgroup.php');
echo html_ac(html_ap() - 1);
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=901532a520b1c71a9fad1625fae753ad24c33202
commit 901532a520b1c71a9fad1625fae753ad24c33202
Author: Franck Villaume <[email protected]>
Date: Fri May 13 20:29:05 2016 +0200
docman listfile view: simplify header. merge subproject + path. one line
with all actions on folder
diff --git a/src/common/docman/views/listfile.php
b/src/common/docman/views/listfile.php
index fe1b403..65393a3 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -99,7 +99,7 @@ $nested_groups = $dgf->getNested($stateidArr);
$nested_docs = array();
$DocGroupName = 0;
-
+$dgpath = '';
if ($dirid) {
$ndg = documentgroup_get_object($dirid, $g->getID());
if ($ndg->isError()) {
@@ -184,14 +184,14 @@ echo html_ac(html_ap() - 1);
if ($DocGroupName) {
$headerPath = '';
if ($childgroup_id) {
- $headerPath .= _('Subproject')._(':
').util_make_link('/docman/?group_id='.$g->getID(), $g->getPublicName()).' ';
+ $headerPath .= _('Subproject')._(':
').util_make_link('/docman/?group_id='.$g->getID(), $g->getPublicName()).'::';
}
- $headerPath .= _('Path')._(': ').html_e('i', array(), $dgpath, false);
- echo html_e('h2', array(), $headerPath, false);
+ $generalpath = $dgpath.'/'.$DocGroupName;
+ $generalpath = preg_replace('/\/\//','/', $generalpath);
+ $headerPath .= html_e('i', array(), $generalpath, 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);
- echo html_ao('h3', array('class' => 'docman_h3'));
- echo html_e('span', array(), _('Document Folder')._(': ').html_e('i',
array(), $DocGroupName, false).' ', false);
+ echo $HTML->paging_top($start, $paging, $nbDocs, $max, $redirecturl,
array('style' => 'display:inline-block'));
/* should we steal the lock on folder ? */
if ($ndg->getLocked()) {
if (session_loggedin() && ($ndg->getLockedBy() ==
$LUSER->getID())) {
@@ -231,11 +231,10 @@ if ($DocGroupName) {
}
echo
util_make_link($redirecturl.'&action=monitordirectory&option='.$option.'&directoryid='.$ndg->getID(),
$image, array('title' => $titleMonitor));
}
- echo html_ac(html_ap() - 1);
if (forge_check_perm('docman', $ndg->Group->getID(), 'approve')) {
echo html_ao('div', array('class' => 'docman_div_include hide',
'id' => 'editdocgroup'));
- echo html_e('h4', array('class' => 'docman_h4'), _('Edit this
folder'), false);
+ echo html_e('h3', array('class' => 'docman_h3'), _('Edit this
folder'), false);
include ($gfcommon.'docman/views/editdocgroup.php');
echo html_ac(html_ap() - 1);
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e53726fd7ff939befece2080c53f6b1a3b32c897
commit e53726fd7ff939befece2080c53f6b1a3b32c897
Author: Franck Villaume <[email protected]>
Date: Fri May 13 20:27:50 2016 +0200
DocumentGroup getPath: remove extra code
diff --git a/src/common/docman/DocumentGroup.class.php
b/src/common/docman/DocumentGroup.class.php
index 969d81e..19b3c75 100644
--- a/src/common/docman/DocumentGroup.class.php
+++ b/src/common/docman/DocumentGroup.class.php
@@ -660,7 +660,7 @@ class DocumentGroup extends FFError {
if ($this->getState() != 1 && !forge_check_perm('docman',
$this->Group->getID(), 'approve')) {
return false;
}
- $returnPath = '';
+ $returnPath = '/';
if ($this->getParentID()) {
$parentDg =
documentgroup_get_object($this->getParentID(), $this->Group->getID());
if ($parentDg->isError()) {
@@ -690,10 +690,6 @@ class DocumentGroup extends FFError {
$returnPath .= '/'.$this->getName();
}
}
-
- if (!strlen($returnPath))
- $returnPath = '/';
-
return $returnPath;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9f08bdec518cc72a6f7baf5d7f9f4786c688b8fb
commit 9f08bdec518cc72a6f7baf5d7f9f4786c688b8fb
Author: Franck Villaume <[email protected]>
Date: Fri May 13 20:18:26 2016 +0200
fix html syntax
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index ca23b87..2885586 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1545,7 +1545,7 @@ if (isset($params['group']) && $params['group']) {
$html_content .= $this->closeForm();
}
}
- return html_e('span', $htmlAttr, $html_content);
+ return html_e('span', $htmlAttr, $html_content, false);
}
/**
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=63cdee82032761aff065c7207793edb2792977c7
commit 63cdee82032761aff065c7207793edb2792977c7
Author: Franck Villaume <[email protected]>
Date: Fri May 13 19:42:53 2016 +0200
layout: paging_top function supports html attributes params
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 3c6af0e..ca23b87 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1526,8 +1526,9 @@ if (isset($params['group']) && $params['group']) {
* @param integer $totalElements total number of this type of
Elements in the forge
* @param integer $maxElements max number of Elements to
display
* @param string $actionUrl next / prev Url to click
+ * @param array $htmlAttr html attributes to set.
*/
- function paging_top($start = 0, $paging = 25, $totalElements = 0,
$maxElements = 0, $actionUrl = '/') {
+ function paging_top($start = 0, $paging = 25, $totalElements = 0,
$maxElements = 0, $actionUrl = '/', $htmlAttr = array()) {
$html_content = '';
$sep = '?';
if (strpos($actionUrl, '?')) {
@@ -1544,7 +1545,7 @@ if (isset($params['group']) && $params['group']) {
$html_content .= $this->closeForm();
}
}
- return $html_content;
+ return html_e('span', $htmlAttr, $html_content);
}
/**
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentGroup.class.php | 6 +-----
src/common/docman/actions/editfile.php | 4 ++--
src/common/docman/views/listfile.php | 17 ++++++++---------
src/common/docman/views/listtrashfile.php | 20 ++++++++++++++------
src/www/include/Layout.class.php | 5 +++--
5 files changed, 28 insertions(+), 24 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
