[Fusionforge-commits] FusionForge branch master updated. e994e26a72aabbd33724dbe2af2f62cdf115a66b

Franck Villaume nerville at fusionforge.org
Sun Mar 2 23:31:51 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  e994e26a72aabbd33724dbe2af2f62cdf115a66b (commit)
       via  9f91ea38a493f8167d06088290dd20b6dd59bc17 (commit)
       via  aaa2b1569fb14c2ac11d9576df95f214f4e3a506 (commit)
      from  e3bc9d000d172b24ba9af3079198668a4db085c9 (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 e994e26a72aabbd33724dbe2af2f62cdf115a66b
Merge: e3bc9d0 9f91ea3
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Mar 2 23:31:10 2014 +0100

    merge Branch_5_3

diff --cc src/common/docman/views/listfile.php
index bdae9fd,7458d41..00771ba
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@@ -217,19 -222,21 +217,19 @@@ if (isset($nested_docs[$dirid]) && is_a
  		$classth[] = 'unsortable';
  	}
  	echo '<div class="docmanDiv">';
 -	echo $HTML->listTableTop($tabletop, false, 'sortable_docman_listfile', 'sortable', $classth);
 +	echo $HTML->listTableTop($tabletop, array(), 'sortable_docman_listfile', 'sortable', $classth);
  	$time_new = 604800;
  	foreach ($nested_docs[$dirid] as $d) {
 -		echo '<tr>';
 -		echo '<td>';
 +		$cells = array();
  		if (!$d->getLocked() && !$d->getReserved()) {
 -			echo '<input type="checkbox" value="'.$d->getID().'" class="checkeddocidactive tabtitle-w" title="'._('Select / Deselect this document for massaction').'" onchange="controllerListFile.checkgeneral(\'active\')" />';
 +			$cells[][] = '<input type="checkbox" value="'.$d->getID().'" class="checkeddocidactive tabtitle-w" title="'._('Select / Deselect this document for massaction').'" onchange="controllerListFile.checkgeneral(\'active\')" />';
  		} else {
  			if (session_loggedin() && ($d->getReservedBy() != $u->getID())) {
- 				$cells[][] = '<input type="checkbox" name="disabled" disabled="disabled"';
 -				echo '<input type="checkbox" name="disabled" disabled="disabled" />';
++				$cells[][] = '<input type="checkbox" name="disabled" disabled="disabled" />';
  			} else {
 -				echo '<input type="checkbox" value="'.$d->getID().'" class="checkeddocidactive tabtitle-w" title="'._('Select / Deselect this document for massaction').'"" onchange="controllerListFile.checkgeneral(\'active\')" />';
 +				$cells[][] = '<input type="checkbox" value="'.$d->getID().'" class="checkeddocidactive tabtitle-w" title="'._('Select / Deselect this document for massaction').'"" onchange="controllerListFile.checkgeneral(\'active\')" />';
  			}
  		}
 -		echo '</td>';
  		switch ($d->getFileType()) {
  			case "URL": {
  				$docurl = $d->getFileName();
@@@ -313,12 -330,12 +313,12 @@@
  			} else {
  				if (session_loggedin() && $d->getReservedBy() != $u->getID()) {
  					if (forge_check_perm('docman', $ndg->Group->getID(), 'admin')) {
- 						$nextcell .= '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=enforcereserve&fileid='.$d->getID().'" title="'. _('Enforce reservation') .'" >'.html_image('docman/enforce-document.png',22,22,array('alt'=>_('Enforce reservation')));
 -						echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=enforcereserve&fileid='.$d->getID().'" title="'. _('Enforce reservation') .'" >'.html_image('docman/enforce-document.png',22,22,array('alt'=>_('Enforce reservation'))).'</a>';
++						$nextcell .= '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=enforcereserve&fileid='.$d->getID().'" title="'. _('Enforce reservation') .'" >'.html_image('docman/enforce-document.png',22,22,array('alt'=>_('Enforce reservation'))).'</a>';
  					}
  				} else {
 -					echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=trashfile&fileid='.$d->getID().'" title="'. _('Move this document to trash') .'" >'.html_image('docman/trash-empty.png',22,22,array('alt'=>_('Move this document to trash'))). '</a>';
 -					echo '<a class="tabtitle-ne" href="#" onclick="javascript:controllerListFile.toggleEditFileView({action:\''.$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').', title:\''.addslashes($d->getName()).'\', filename:\''.$d->getFilename().'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})" title="'. _('Edit this document') .'" >'.html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))). '</a>';
 -					echo '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=releasefile&fileid='.$d->getID().'" title="'. _('Release reservation') .'" >'.html_image('docman/release-document.png',22,22,array('alt'=>_('Release reservation'))). '</a>';
 +					$nextcell .= '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=trashfile&fileid='.$d->getID().'" title="'. _('Move this document to trash') .'" >'.html_image('docman/trash-empty.png',22,22,array('alt'=>_('Move this document to trash'))). '</a>';
 +					$nextcell .= '<a class="tabtitle-ne" href="#" onclick="javascript:controllerListFile.toggleEditFileView({action:\''.$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').', title:\''.addslashes($d->getName()).'\', filename:\''.$d->getFilename().'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', useCreateOnline:'.$d->Group->useCreateOnline().', docManURL:\''.util_make_uri("docman").'\'})" title="'. _('Edit this document') .'" >'.html_image('docman/edit-file.png',22,22,array('alt'=>_('Edit this document'))). '</a>';
 +					$nextcell .= '<a class="tabtitle-ne" href="'.$actionlistfileurl.'&action=releasefile&fileid='.$d->getID().'" title="'. _('Release reservation') .'" >'.html_image('docman/release-document.png',22,22,array('alt'=>_('Release reservation'))). '</a>';
  				}
  			}
  			if (session_loggedin()) {

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

Summary of changes:
 src/common/docman/views/listfile.php |    4 +-
 src/www/soap/nusoap.php              | 4990 +++++++++++++++++-----------------
 2 files changed, 2473 insertions(+), 2521 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list