[Fusionforge-commits] FusionForge branch master updated. 6.0.4-1151-gd1c7a1f

[Franck Villaume]

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  d1c7a1f03b2d1054f73110d767db60c728bba5a0 (commit)
      from  0721ea9f46cae8bc669fd7c7a7f16f986e108480 (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=d1c7a1f03b2d1054f73110d767db60c728bba5a0

commit d1c7a1f03b2d1054f73110d767db60c728bba5a0
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date:   Tue Nov 15 13:58:25 2016 +0100

    display docid as ID column to help identification for object associations

diff --git a/src/common/docman/views/listfile.php 
b/src/common/docman/views/listfile.php
index 4fbe03b..e5dde76 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -239,8 +239,8 @@ if ($DocGroupName) {
 }
 
 if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
-       $tabletop = array(html_e('input', array('id' => 'checkallactive', 
'type' => 'checkbox', 'title' => _('Select / Deselect all documents for 
massaction'), 'onClick' => 'controllerListFile.checkAll("checkeddocidactive", 
"active")')), '', _('File Name'), _('Title'), _('Description'), _('Author'), 
_('Last time'), _('Status'), _('Size'), _('View'));
-       $classth = array('unsortable', 'unsortable', '', '', '', '', '', '', 
'', '');
+       $tabletop = array(html_e('input', array('id' => 'checkallactive', 
'type' => 'checkbox', 'title' => _('Select / Deselect all documents for 
massaction'), 'onClick' => 'controllerListFile.checkAll("checkeddocidactive", 
"active")')), '', 'ID', _('File Name'), _('Title'), _('Description'), 
_('Author'), _('Last time'), _('Status'), _('Size'), _('View'));
+       $classth = array('unsortable', 'unsortable', '', '', '', '', '', '', 
'', '', '');
        if (forge_check_perm('docman', $ndg->Group->getID(), 'approve')) {
                $tabletop[] = _('Actions');
                $classth[] = 'unsortable';
@@ -273,6 +273,7 @@ if (isset($nested_docs[$dirid]) && 
is_array($nested_docs[$dirid])) {
                                $cells[][] =  
util_make_link('/docman/view.php/'.$d->Group->getID().'/'.$d->getID(), 
html_image($d->getFileTypeImage(), 22, 22, array('alt' => $d->getFileType())), 
array('title' => _('View this document')));
                        }
                }
+               $cells[][] = 'D'.$d->getID();
                $nextcell = '';
                if (($d->getUpdated() && $time_new > (time() - 
$d->getUpdated())) || $time_new > (time() - $d->getCreated())) {
                        $nextcell = $HTML->getNewPic(_('Created or updated 
since less than 7 days'), 'new').'&nbsp;';
diff --git a/src/common/docman/views/listtrashfile.php 
b/src/common/docman/views/listtrashfile.php
index 2600ab8..71c23db 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -150,8 +150,8 @@ if ($DocGroupName) {
 }
 
 if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
-       $tabletop = array(html_e('input', array('id' => 'checkallactive', 
'title' => _('Select / Deselect all documents for massaction'), 'type' => 
'checkbox', 'onClick' => 'controllerListFile.checkAll("checkeddocidactive", 
"active")')), '', _('File Name'), _('Title'), _('Description'), _('Author'), 
_('Last time'), _('Status'), _('Size'), _('Actions'));
-       $classth = array('unsortable', 'unsortable', '', '', '', '', '', '', 
'', 'unsortable');
+       $tabletop = array(html_e('input', array('id' => 'checkallactive', 
'title' => _('Select / Deselect all documents for massaction'), 'type' => 
'checkbox', 'onClick' => 'controllerListFile.checkAll("checkeddocidactive", 
"active")')), '', 'ID', _('File Name'), _('Title'), _('Description'), 
_('Author'), _('Last time'), _('Status'), _('Size'), _('Actions'));
+       $classth = array('unsortable', 'unsortable', '', '', '', '', '', '', 
'', '', 'unsortable');
        echo html_ao('div', array('class' => 'docmanDiv'));
        echo $HTML->listTableTop($tabletop, array(), 'sortable', 
'sortable_docman_listfile', $classth);
        $time_new = 604800;
@@ -167,6 +167,7 @@ if (isset($nested_docs[$dirid]) && 
is_array($nested_docs[$dirid])) {
                                $cells[][] = 
util_make_link('/docman/view.php/'.$group_id.'/'.$d->getID().'/'.urlencode($d->getFileName()),
 html_image($d->getFileTypeImage(), 20, 20, array('alt' => $d->getFileType())), 
array('title' => _('View this document')));
                        }
                }
+               $cells[][] = 'D'.$d->getID();
                $nextcell ='';
                if (($d->getUpdated() && $time_new > (time() - 
$d->getUpdated())) || $time_new > (time() - $d->getCreated())) {
                        $nextcell.= $HTML->getNewPic(_('Created or updated 
since less than 7 days'), 'new', array('class' => 
'docman-newdocument')).'&nbsp;';

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

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


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits