[Fusionforge-commits] FusionForge branch master updated. 33296e22101dd0671398500a15dffc9c2851c745

Franck Villaume nerville at fusionforge.org
Thu Mar 6 11:37:55 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, master has been updated
       via  33296e22101dd0671398500a15dffc9c2851c745 (commit)
       via  8892ffb7ca6e9ecac95bdc3c22e74c42c521af52 (commit)
       via  1c4428260cdf17c4caa194958084f361b9547538 (commit)
       via  57655dd300e111ccc12363803799c8d5282996b6 (commit)
      from  04276e10d1ff8e23744cffb77c0c8867623a0cda (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 33296e22101dd0671398500a15dffc9c2851c745
Merge: 8892ffb 1c44282
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Mar 6 11:37:27 2014 +0100

    merge Branch_5_3

diff --cc src/common/docman/views/listtrashfile.php
index 73b2263,80e2e5f..8956b29
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@@ -207,7 -211,11 +208,11 @@@ if (isset($nested_docs[$dirid]) && is_a
  	}
  }
  
 -echo '</div>';
 +echo html_ac(html_ap() -1);
- if (forge_check_perm('docman', $g->getID(), 'approve')) {
+ $foundFiles = 0;
+ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
+ 	$foundFiles = count($nested_docs[$dirid]);
+ }
+ if (forge_check_perm('docman', $g->getID(), 'approve') && $foundFiles) {
  	include ($gfcommon.'docman/views/editfile.php');
  }

commit 8892ffb7ca6e9ecac95bdc3c22e74c42c521af52
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Mar 5 13:23:13 2014 +0100

    docman: use html_{ao,ac,ap,e} helpers

diff --git a/src/common/docman/views/listtrashfile.php b/src/common/docman/views/listtrashfile.php
index 145e1f5..73b2263 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -81,13 +81,14 @@ if ($d_arr != NULL ) {
 	}
 }
 
-echo '<div id="leftdiv">';
+echo html_ao('div', array('id' => 'leftdiv'));
 include ($gfcommon.'docman/views/tree.php');
-echo '</div>';
-echo '<div id="rightdiv">';
-echo '<div style="padding:5px;"><form id="emptytrash" name="emptytrash" method="post" action="?group_id='.$group_id.'&action=emptytrash" >';
-echo '<input id="submitemptytrash" type="submit" value="'. _('Delete permanently all documents and folders with deleted status.') .'" >';
-echo '</form></div>';
+echo html_ac(html_ap() - 1);
+echo html_ao('div', array('id' => 'rightdiv'));
+echo html_ao('div', array('style' => 'padding:5px'));
+echo html_ao('form', array('id' => 'emptytrash', 'name' => 'emptytrash', 'method' => 'post', 'action' => '/docman/?group_id='.$group_id.'&action=emptytrash'));
+echo html_e('input', array('id' => 'submitemptytrash', 'type' => 'submit', 'value' => _('Delete permanently all documents and folders with deleted status.')));
+echo html_ac(html_ap() - 2);
 ?>
 <script type="text/javascript">//<![CDATA[
 var controllerListTrash;
@@ -202,11 +203,11 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 	echo '</div>';
 } else {
 	if ($dirid) {
-		echo '<p class="information">'._('No documents.').'</p>';
+		echo html_e('p', array('class' => 'information', _('No documents.'), false));
 	}
 }
 
-echo '</div>';
+echo html_ac(html_ap() -1);
 if (forge_check_perm('docman', $g->getID(), 'approve')) {
 	include ($gfcommon.'docman/views/editfile.php');
 }

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

Summary of changes:
 src/common/docman/views/listfile.php       |   11 +++++--
 src/common/docman/views/listtrashfile.php  |   26 ++++++++++-------
 src/www/docman/scripts/DocManController.js |   43 ++++++++++++++++++++--------
 3 files changed, 56 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list