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 0b035f26f092e7eb9cca3d8d4a04a01bc2786487 (commit)
via 97e631085c5790bce0803d9638102610719c1e38 (commit)
from c337fb638e1e43b533ee655db31fe96d497f8ddf (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=0b035f26f092e7eb9cca3d8d4a04a01bc2786487
commit 0b035f26f092e7eb9cca3d8d4a04a01bc2786487
Author: Franck Villaume <[email protected]>
Date: Wed Dec 14 16:50:04 2016 +0100
fix pending file version edit
diff --git a/src/common/docman/DocumentVersionFactory.class.php
b/src/common/docman/DocumentVersionFactory.class.php
index 92bafec..e61f502 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:
'.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);
+ $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']).'\', docid: '.$arr['docid'].', groupId:
'.$this->Document->Group->getID().'})'), 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: '.ltrim($arr['version'],
'_').'})'), true);
}
diff --git a/src/common/docman/views/listfile.php
b/src/common/docman/views/listfile.php
index 49f00d2..1d42139 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -171,7 +171,8 @@ jQuery(document).ready(function() {
page: 'listfile',
docgroupId: <?php echo $dirid ?>,
lockIntervalDelay: 60000,
- tableAddVersion: jQuery('#doc_version_edit')
+ tableAddVersion: jQuery('#doc_version_edit'),
+ useCreateOnline: <?php echo $g->useCreateOnline() ?>
});
});
@@ -334,7 +335,7 @@ if (isset($nested_docs[$dirid]) &&
is_array($nested_docs[$dirid])) {
if (!$d->getLocked() && !$d->getReserved()) {
$nextcell .=
util_make_link($redirecturl.'&action=trashfile&fileid='.$d->getID(),
$HTML->getDeletePic(_('Move this document to trash'), 'delfile'));
- $nextcell .= util_make_link('#',
$HTML->getEditFilePic($edittitle, 'editdocument'), array('onclick' =>
'javascript:controllerListFile.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
useCreateOnline:'.$d->Group->useCreateOnline().',
docManURL:\''.util_make_uri('/docman').'\'})'), true);
+ $nextcell .= util_make_link('#',
$HTML->getEditFilePic($edittitle, 'editdocument'), array('onclick' =>
'javascript:controllerListFile.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
docManURL:\''.util_make_uri('/docman').'\'})'), true);
if (session_loggedin()) {
$nextcell .=
util_make_link($redirecturl.'&action=reservefile&fileid='.$d->getID(),
html_image('docman/reserve-document.png', 22, 22, array('alt' => _('Reserve
this document'))), array('title' => _('Reserve this document for later
edition')));
}
@@ -345,7 +346,7 @@ if (isset($nested_docs[$dirid]) &&
is_array($nested_docs[$dirid])) {
}
} else {
$nextcell .=
util_make_link($redirecturl.'&action=trashfile&fileid='.$d->getID(),
$HTML->getDeletePic(_('Move this document to trash'), 'delfile'));
- $nextcell .= util_make_link('#',
$HTML->getEditFilePic($edittitle, 'editdocument'), array('onclick' =>
'javascript:controllerListFile.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
useCreateOnline:'.$d->Group->useCreateOnline().',
docManURL:\''.util_make_uri('/docman').'\'})'), true);
+ $nextcell .= util_make_link('#',
$HTML->getEditFilePic($edittitle, 'editdocument'), array('onclick' =>
'javascript:controllerListFile.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' ,
id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\',
docManURL:\''.util_make_uri('/docman').'\'})'), true);
$nextcell .=
util_make_link($redirecturl.'&action=releasefile&fileid='.$d->getID(),
html_image('docman/release-document.png', 22, 22, array('alt' => _('Release
reservation'))), array('title' => _('Release reservation')));
}
}
diff --git a/src/common/docman/views/pendingfiles.php
b/src/common/docman/views/pendingfiles.php
index b304bf2..8da8629 100644
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@ -55,7 +55,8 @@ jQuery(document).ready(function() {
divEditFile: jQuery('#editFile'),
divEditTitle: '<?php echo _("Edit document dialog
box") ?>',
childGroupId: <?php echo util_ifsetor($childgroup_id,
0) ?>,
- tableAddVersion: jQuery('#doc_version_edit')
+ tableAddVersion: jQuery('#doc_version_edit'),
+ useCreateOnline: <?php echo $g->useCreateOnline() ?>
});
});
//]]>
diff --git a/src/www/docman/scripts/DocManController.js
b/src/www/docman/scripts/DocManController.js
index 3fc9717..a8cd2d8 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -594,7 +594,7 @@ DocManListFileController.prototype =
jQuery('#defaulteditfiletype').val('text/plain');
}
if (this.version.isText) {
-
jQuery.getJSON(this.listfileparams.docManURL+'/?group_id='+this.docparams.groupId+'&action=getfile&type=file&itemid='+this.docparams.id+'&version='+this.version.version,
jQuery.proxy(function(data){
+
jQuery.getJSON(this.listfileparams.docManURL+'/?group_id='+this.version.groupId+'&action=getfile&type=file&itemid='+this.version.id+'&version='+this.version.version,
jQuery.proxy(function(data){
if (data) {
jQuery('#defaulteditzone').text(data.body);
}
@@ -610,7 +610,7 @@ DocManListFileController.prototype =
jQuery('#editonlineroweditfile').hide();
jQuery('#editor').attr('disabled', true);
jQuery('#editButtonUrl').prop('checked', true);
- } else if (this.docparams.useCreateOnline &&
this.version.isText){
+ } else if (this.listfileparams.useCreateOnline &&
this.version.isText){
jQuery('#fileurlroweditfile').hide();
jQuery('#uploadnewroweditfile').hide();
jQuery('#editonlineroweditfile').show();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=97e631085c5790bce0803d9638102610719c1e38
commit 97e631085c5790bce0803d9638102610719c1e38
Author: Franck Villaume <[email protected]>
Date: Wed Dec 14 16:49:07 2016 +0100
better help message
diff --git a/src/common/docman/views/editfile.php
b/src/common/docman/views/editfile.php
index 876a9d5..16ca5bb 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -104,7 +104,7 @@ $cells[][] = html_e('textarea', array('id' => 'vcomment',
'name' => 'vcomment',
echo $HTML->multiTableRow(array(), $cells);
if ($g->useDocmanSearch()) {
$cells = array();
- $cells[] = array(_('Both fields are used by the document search
engine.'), 'colspan' => 2);
+ $cells[] = array(_('Both title & description fields can be parsed by
the document search engine.'), 'colspan' => 2);
echo $HTML->multiTableRow(array(), $cells);
}
$cells = array();
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentVersionFactory.class.php | 2 +-
src/common/docman/views/editfile.php | 2 +-
src/common/docman/views/listfile.php | 7 ++++---
src/common/docman/views/pendingfiles.php | 3 ++-
src/www/docman/scripts/DocManController.js | 4 ++--
5 files changed, 10 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
