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 36698b2fea52c4eb9f7e82e17980e5589c49dde7 (commit)
from 5cb7e7ce89682addc3827f5bee7c45558e5156ae (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=36698b2fea52c4eb9f7e82e17980e5589c49dde7
commit 36698b2fea52c4eb9f7e82e17980e5589c49dde7
Author: Franck Villaume <[email protected]>
Date: Thu Jan 26 08:28:51 2017 +0000
fix injectzip if manual upload disabled
diff --git a/src/common/docman/views/additem.php
b/src/common/docman/views/additem.php
index e2bee54..d348da2 100644
--- a/src/common/docman/views/additem.php
+++ b/src/common/docman/views/additem.php
@@ -83,8 +83,10 @@ if (forge_check_perm('docman', $group_id, 'approve')) {
} else {
echo $HTML->openForm(array('id' => 'injectzip', 'name' =>
'injectzip', 'method' => 'post', 'action' =>
'/docman/?group_id='.$group_id.'&action=injectzip&dirid='.$dirid, 'enctype' =>
'multipart/form-data'));
if (forge_get_config('use_manual_uploads')) {
- echo html_e('input', array('type' => 'radio', 'id' =>
'buttonFileZip', 'name' => 'type', 'value' => 'httpupload', 'checked' => '
', 'required' => 'required')).html_e('span', array(), _('File'), false);
+ echo html_e('input', array('type' => 'radio', 'id' =>
'buttonFileZip', 'name' => 'type', 'value' => 'httpupload', 'checked' =>
'checked', 'required' => 'required')).html_e('span', array(), _('File'), false);
echo html_e('input', array('type' => 'radio', 'id' =>
'buttonManualUploadZip', 'name' => 'type', 'value' => 'manualupload',
'required' => 'required')).html_e('span', array(), _('Already-uploaded file'),
false);
+ } else {
+ echo html_e('input', array('type' => 'hidden', 'name'
=> 'type', 'value' => 'httpupload'));
}
echo html_e('div', array('id' => 'upload_zip_p'),
html_e('input', array('type' => 'file', 'id' => 'uploaded_zip', 'name' =>
'uploaded_zip', 'required' => 'required')).
html_e('span', array(), '('._('max
upload size')._(': ').human_readable_bytes(util_get_maxuploadfilesize()).')',
false));
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/additem.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
