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 e348150166922dbe7b1354e49a6940d942959f3d (commit)
from 5a0221ff54864095aac170dda4018c3ea793f6e6 (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=e348150166922dbe7b1354e49a6940d942959f3d
commit e348150166922dbe7b1354e49a6940d942959f3d
Author: Franck Villaume <[email protected]>
Date: Mon Oct 10 17:39:15 2016 +0200
document activity: set the correct view based on state id
diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index 2a37089..f8ae525 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -364,7 +364,12 @@ echo $HTML->closeForm();
$docmanerror = 1;
}
$icon = html_image('ic/docman16b.png',
'', '', array('alt'=>_('Documents')));
- $url =
util_make_link('docman/?group_id='.$arr['group_id'].'&view=listfile&dirid='.$arr['ref_id'],_('Document').'
'.$arr['description']);
+ if ($document->getStateID() == 2) {
+ $view = 'listtrashfile';
+ } else {
+ $view = 'listfile';
+ }
+ $url =
util_make_link('docman/?group_id='.$arr['group_id'].'&view='.$view.'&dirid='.$arr['ref_id'],_('Document').'
'.$arr['description']);
break;
}
case 'docgroupnew': {
@@ -373,7 +378,12 @@ echo $HTML->closeForm();
$docmanerror = 1;
}
$icon = html_image('ic/cfolder15.png',
'', '', array("alt"=>_('Directory')));
- $url =
util_make_link('docman/?group_id='.$arr['group_id'].'&view=listfile&dirid='.$arr['subref_id'],_('Directory').'
'.$arr['description']);
+ if ($dg->getStateID() == 2) {
+ $view = 'listtrashfile';
+ } else {
+ $view = 'listfile';
+ }
+ $url =
util_make_link('docman/?group_id='.$arr['group_id'].'&view='.$view.'&dirid='.$arr['subref_id'],_('Directory').'
'.$arr['description']);
break;
}
default: {
-----------------------------------------------------------------------
Summary of changes:
src/www/activity/index.php | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
