[Fusionforge-commits] FusionForge branch master updated. 6.0.4-1009-gcefd1bb

[Franck Villaume]

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  cefd1bb5c50d685903dc3a740ef029765c740ef9 (commit)
      from  e348150166922dbe7b1354e49a6940d942959f3d (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=cefd1bb5c50d685903dc3a740ef029765c740ef9

commit cefd1bb5c50d685903dc3a740ef029765c740ef9
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Oct 10 17:51:29 2016 +0200

    activity page: set missing break, use HTML theme icon, use document filetype icon

diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index f8ae525..2ed6366 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -358,12 +358,14 @@ echo $HTML->closeForm();
 					$stateid = $document->getStateID();
 					if ($stateid != 1 && !forge_check_perm('docman', $arr['group_id'], 'approve')) {
 						$docmanerror = 1;
+						break;
 					}
 					$dg = documentgroup_get_object($arr['ref_id'], $arr['group_id']);
 					if (!$dg || $dg->isError() || !$dg->getPath(true, false)) {
 						$docmanerror = 1;
+						break;
 					}
-					$icon = html_image('ic/docman16b.png', '', '', array('alt'=>_('Documents')));
+					$icon = html_image($document->getFileTypeImage(), 22, 22, array('alt' => $document->getFileType()));
 					if ($document->getStateID() == 2) {
 						$view = 'listtrashfile';
 					} else {
@@ -376,9 +378,10 @@ echo $HTML->closeForm();
 					$dg = documentgroup_get_object($arr['subref_id'], $arr['group_id']);
 					if (!$dg || $dg->isError() || !$dg->getPath(true, false)) {
 						$docmanerror = 1;
+						break;
 					}
-					$icon = html_image('ic/cfolder15.png', '', '', array("alt"=>_('Directory')));
-					if ($dg->getStateID() == 2) {
+					$icon = $HTML->getFolderPic('', _('Directory'));
+					if ($dg->getState() == 2) {
 						$view = 'listtrashfile';
 					} else {
 						$view = 'listfile';

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

Summary of changes:
 src/www/activity/index.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge