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  47e8d2a9b420d46c8590e029b83c1a636013f44a (commit)
      from  875e17b0346f62f332faceeaabfa6b1c4a97544d (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=47e8d2a9b420d46c8590e029b83c1a636013f44a

commit 47e8d2a9b420d46c8590e029b83c1a636013f44a
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date:   Tue Oct 11 12:01:43 2016 +0200

    docman fixes for deleted document versions

diff --git a/src/common/docman/actions/editfile.php 
b/src/common/docman/actions/editfile.php
index 518d533..2d65944 100644
--- a/src/common/docman/actions/editfile.php
+++ b/src/common/docman/actions/editfile.php
@@ -149,7 +149,7 @@ if ($version) {
                $filename = $file_url;
                $filetype = 'URL';
        }
-} elseif (($d->getDocGroupID() != $doc_group) || ($d->getState() != $stateid)) 
{
+} elseif (($d->getDocGroupID() != $doc_group) || ($d->getStateID() != 
$stateid)) {
        // we do the update based on the current version.
        $dv = documentversion_get_object($current_version_radio, $docid, 
$group_id);
        $filename = $dv->getFileName();
diff --git a/src/common/docman/views/listtrashfile.php 
b/src/common/docman/views/listtrashfile.php
index ef70991..2600ab8 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -113,6 +113,7 @@ jQuery(document).ready(function() {
                buttonEditDirectory:    jQuery('#docman-editdirectory'),
                docManURL:              '<?php echo util_make_uri('/docman') 
?>',
                lockIntervalDelay:      60000, //in microsecond and if you 
change this value, please update the check value 600
+               childGroupId:           <?php echo util_ifsetor($childgroup_id, 
0) ?>,
                divLeft:                jQuery('#leftdiv'),
                divRight:               jQuery('#rightdiv'),
                divEditFile:            jQuery('#editFile'),
diff --git a/src/www/docman/scripts/DocManController.js 
b/src/www/docman/scripts/DocManController.js
index 98e73d9..2f019e4 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -426,7 +426,7 @@ DocManListFileController.prototype =
                                                                
filenametdcontent.attr('href', 
eachdocparams.docManURL+'/view.php/'+eachdocparams.groupId+'/versions/'+eachdocparams.id+'/'+val.version.substring(1));
                                                        }
                                                } else {
-                                                       filenametdcontent = 
val.filename;
+                                                       filenametdcontent = 
jQuery('<span>'+val.filename+'</span>');
                                                }
                                                versionactiontdcontent = '';
                                                versionActionsArrayLength = 
val.versionactions.length;

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

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


hooks/post-receive
-- 
FusionForge

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

Reply via email to