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  9231dad76484098ef5393673e6411f167787657f (commit)
      from  aa7921bedd51d87636ce9650bdade72308750db9 (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=9231dad76484098ef5393673e6411f167787657f

commit 9231dad76484098ef5393673e6411f167787657f
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date:   Thu Sep 22 15:34:31 2016 +0200

    docman: handle correctly description on multiple lines

diff --git a/src/common/docman/DocumentVersionFactory.class.php 
b/src/common/docman/DocumentVersionFactory.class.php
index 4f8e70d..db11f83 100644
--- a/src/common/docman/DocumentVersionFactory.class.php
+++ b/src/common/docman/DocumentVersionFactory.class.php
@@ -86,7 +86,7 @@ class DocumentVersionFactory extends FFError {
                                if (preg_match('/html/i', $arr['filetype'])) { 
// text plain, text html, text x-patch, etc
                                        $isHtml = 1;
                                }
-                               $arr['versionactions'][] = util_make_link('#', 
$HTML->getEditFilePic(_('Edit this version'), 'editversion'), array('id' => 
'version_action_edit', 'onclick' => 
'javascript:controllerListFile.toggleEditVersionView({title: 
\''.addslashes($arr['title']).'\', description: 
\''.addslashes($arr['description']).'\', version: '.ltrim($arr['version'], 
'_').', current_version: '.$arr['current_version'].', isURL: '.$isURL.', 
isText: '.$isText.', isHtml: '.$isHtml.', filename: 
\''.addslashes($arr['filename']).'\', vcomment: 
\''.addslashes($arr['vcomment']).'\'})'), true);
+                               $arr['versionactions'][] = util_make_link('#', 
$HTML->getEditFilePic(_('Edit this version'), 'editversion'), array('id' => 
'version_action_edit', 'onclick' => 
'javascript:controllerListFile.toggleEditVersionView({title: 
\''.addslashes($arr['title']).'\', description: 
'.json_encode($arr['description']).', version: '.ltrim($arr['version'], '_').', 
current_version: '.$arr['current_version'].', isURL: '.$isURL.', isText: 
'.$isText.', isHtml: '.$isHtml.', filename: 
\''.addslashes($arr['filename']).'\', vcomment: 
\''.addslashes($arr['vcomment']).'\'})'), true);
                                if ($numrows > 1) {
                                        $arr['versionactions'][] = 
util_make_link('#', $HTML->getRemovePic(_('Permanently delete this version'), 
'delversion'), array('id' => 'version_action_delete', 'onclick' => 
'javascript:controllerListFile.deleteVersion({version: '.$arr['version'].'})'), 
true);
                                }
diff --git a/src/common/docman/views/listfile.php 
b/src/common/docman/views/listfile.php
index d94324c..18dd8cf 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -350,7 +350,7 @@ if (isset($nested_docs[$dirid]) && 
is_array($nested_docs[$dirid])) {
                                }
                                $nextcell .= 
util_make_link($redirecturl.'&action=monitorfile&option='.$option.'&fileid='.$d->getID(),
 $image, array('title' => $titleMonitor));
                        }
-                       $nextcell .= util_make_link('#', 
html_image('ic/mail-send.png', 22, 22, array('alt' => _('Notify'))), 
array('onclick' => 
'javascript:controllerListFile.toggleNotifyUserView({action:\''.util_make_uri($notifyaction).'\',
 lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' , 
id:'.$d->getID().', groupId:'.$d->Group->getID().', 
docgroupId:'.$d->getDocGroupID().', title:\''.addslashes($d->getName()).'\', 
filename:\''.addslashes($d->getFileName()).'\', 
description:\''.addslashes(strip_tags($d->getDescription())).'\', 
isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', 
isHtml:\''.$d->isHtml().'\', docManURL:\''.util_make_uri('/docman').'\'})', 
'title' => _('Notify users')), true);
+                       $nextcell .= util_make_link('#', 
html_image('ic/mail-send.png', 22, 22, array('alt' => _('Notify'))), 
array('onclick' => 
'javascript:controllerListFile.toggleNotifyUserView({action:\''.util_make_uri($notifyaction).'\',
 lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' , 
id:'.$d->getID().', groupId:'.$d->Group->getID().', 
docgroupId:'.$d->getDocGroupID().', title:\''.addslashes($d->getName()).'\', 
filename:\''.addslashes($d->getFileName()).'\', 
description:'.json_encode($d->getDescription()).'\', isURL:\''.$d->isURL().'\', 
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', 
docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Notify users')), 
true);
                        $cells[][] = $nextcell;
                }
                echo $HTML->multiTableRow(array(), $cells);
@@ -411,7 +411,7 @@ if ($DocGroupName) {
                                                                                
                                
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
                                                                                
                                
title:\''.addslashes($localDocumentObject->getName()).'\',
                                                                                
                                
filename:\''.addslashes($localDocumentObject->getFileName()).'\',
-                                                                               
                                
description:\''.addslashes($localDocumentObject->getDescription()).'\',
+                                                                               
                                
description:'.json_encode($localDocumentObject->getDescription()).',
                                                                                
                                isURL:\''.$localDocumentObject->isURL().'\',
                                                                                
                                isText:\''.$localDocumentObject->isText().'\',
                                                                                
                                isHtml:\''.$d->isHtml().'\',

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

Summary of changes:
 src/common/docman/DocumentVersionFactory.class.php | 2 +-
 src/common/docman/views/listfile.php               | 4 ++--
 2 files changed, 3 insertions(+), 3 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