[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.2-20-g0cde4e1

Franck Villaume nerville at libremir.placard.fr.eu.org
Tue Jul 14 15:53:11 CEST 2015


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.0 has been updated
       via  0cde4e1c3a1a0f71860a868376bd2cb293be7f59 (commit)
       via  bdf0bb74b9e53948ee007004dd9d6ae4f73b0fc6 (commit)
      from  fe210b2384088ce80578c677ebacb1265c8eeae8 (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=0cde4e1c3a1a0f71860a868376bd2cb293be7f59

commit 0cde4e1c3a1a0f71860a868376bd2cb293be7f59
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Jul 14 15:52:40 2015 +0200

    sync CHANGES

diff --git a/src/CHANGES b/src/CHANGES
index 5ae56ac..f7f6c5c 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,6 +1,7 @@
 Fusionforge 6.0.3:
 * Layout: fix rss url when url is absolute (TrivialDev)
 * Accounts: accept more elliptic curve ssh keys types (Unit 193 & Inria)
+* Docman: fix filesize sort [#784] (TrivialDev)
 
 FusionForge 6.0.2:
 * Accounts: fix elliptic curve ssh keys support (Inria)

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bdf0bb74b9e53948ee007004dd9d6ae4f73b0fc6

commit bdf0bb74b9e53948ee007004dd9d6ae4f73b0fc6
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Jul 14 15:51:27 2015 +0200

    fix [#784] docman: file size sort wrong

diff --git a/src/common/docman/views/listfile.php b/src/common/docman/views/listfile.php
index e45f59b..7ea67e5 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -277,9 +277,9 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 		$cells[] = array($d->getDescription(), 'style' => 'word-wrap: break-word; max-width: 250px;');
 		$cells[][] =  make_user_link($d->getCreatorUserName(), $d->getCreatorRealName());
 		if ($d->getUpdated()) {
-			$cells[] = array(date(_('Y-m-d H:i'), $d->getUpdated()), 'sorttable_customkey' => $d->getUpdated());
+			$cells[] = array(date(_('Y-m-d H:i'), $d->getUpdated()), 'content' => $d->getUpdated());
 		} else {
-			$cells[] = array(date(_('Y-m-d H:i'), $d->getCreated()), 'sorttable_customkey' => $d->getCreated());
+			$cells[] = array(date(_('Y-m-d H:i'), $d->getCreated()), 'content' => $d->getCreated());
 		}
 		$nextcell = '';
 		if ($d->getReserved()) {
@@ -300,7 +300,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 				break;
 			}
 			default: {
-				$cells[][] = human_readable_bytes($d->getFileSize());
+				$cells[] = array(human_readable_bytes($d->getFileSize()), 'content' => $d->getFileSize());
 				break;
 			}
 		}

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

Summary of changes:
 src/CHANGES                          | 1 +
 src/common/docman/views/listfile.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list