[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 114ef5a34360cc54c86b72702beb7572bbddd8f5

Franck VILLAUME nerville at fusionforge.org
Sat Feb 22 13:53:25 CET 2014


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, Branch_5_3 has been updated
       via  114ef5a34360cc54c86b72702beb7572bbddd8f5 (commit)
      from  78602de3b090804dbfa792874ba6ed11df253e28 (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 -----------------------------------------------------------------
commit 114ef5a34360cc54c86b72702beb7572bbddd8f5
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Feb 22 13:52:49 2014 +0100

    docman: fix display with use_manual_uploads

diff --git a/src/common/docman/views/addfile.php b/src/common/docman/views/addfile.php
index 91fcb4f..0d37b8d 100644
--- a/src/common/docman/views/addfile.php
+++ b/src/common/docman/views/addfile.php
@@ -138,27 +138,28 @@ if ($dgf->getNested() == NULL) {
 					.'</td><td>'
 						.'<input type="url" name="file_url" size="30" placeholder="'._('Enter a valid URL').'" pattern="ftp://.+|https?://.+" />
 					</td>
-				</tr>
-				<tr id="pathrow" style="display:none">
+				</tr>';
+	if (forge_get_config('use_manual_uploads')) {
+		echo '		<tr id="pathrow" style="display:none">
 					<td>
 						'. _('File') . utils_requiredField() . '</td><td>';
-
-	$incoming = forge_get_config('groupdir_prefix')."/".$g->getUnixName()."/incoming";
-	$manual_files_arr = ls($incoming, true);
-	if (count($manual_files_arr)) {
-		echo html_build_select_box_from_arrays($manual_files_arr, $manual_files_arr, 'manual_path', '');
-		echo '		<br />';
-		printf(_('Pick a file already uploaded (by SFTP or SCP) to the <a href="%2$s">project\'s incoming directory</a> (%1$s).'),
-		       $incoming, "sftp://" . forge_get_config('web_host') . $incoming . "/");
-		echo '
-					</td>
-				</tr>';
-	} else {
-		echo '		<p class="warning">';
-			printf(_('You need first to upload file in %s'),$incoming);
-		echo '		</p>';
-		echo '			</td>
-				</tr>';
+		$incoming = forge_get_config('groupdir_prefix')."/".$g->getUnixName()."/incoming";
+		$manual_files_arr = ls($incoming, true);
+		if (count($manual_files_arr)) {
+			echo html_build_select_box_from_arrays($manual_files_arr, $manual_files_arr, 'manual_path', '');
+			echo '		<br />';
+			printf(_('Pick a file already uploaded (by SFTP or SCP) to the <a href="%2$s">project\'s incoming directory</a> (%1$s).'),
+			$incoming, "sftp://" . forge_get_config('web_host') . $incoming . "/");
+			echo '
+						</td>
+					</tr>';
+		} else {
+			echo '		<p class="warning">';
+				printf(_('You need first to upload file in %s'),$incoming);
+			echo '		</p>';
+			echo '			</td>
+					</tr>';
+		}
 	}
 	echo '			<tr id="editnamerow" style="display:none">
 					<td>

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

Summary of changes:
 src/common/docman/views/addfile.php |   39 ++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list