[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1372-g1527d45

[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  1527d45df9bb82f23f1d6c4fccc6675aabc05d57 (commit)
       via  0770a75f3db8b199a09757d260dab8336682d995 (commit)
       via  f813bb0630b1d7c11fd1e073075f0da8379b7efa (commit)
      from  69293f2276624268cfb6d53bcb0d397354870662 (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=1527d45df9bb82f23f1d6c4fccc6675aabc05d57

commit 1527d45df9bb82f23f1d6c4fccc6675aabc05d57
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jan 22 12:51:31 2017 +0100

    use standard util_display_user

diff --git a/src/common/tracker/actions/browse.php b/src/common/tracker/actions/browse.php
index 2dc518a..e0e8ae5 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -649,13 +649,25 @@ if ($art_arr && $art_cnt > 0) {
 					echo '<td class="priority'.$art_arr[$i]->getPriority()  .'">'. $art_arr[$i]->getPriority() .'</td>';
 					break;
 				case 'assigned_to':
-					echo '<td>'. $art_arr[$i]->getAssignedRealName() .'</td>';
+					if($art_arr[$i]->getAssignedTo() != 100) {
+						echo '<td>'.util_display_user($art_arr[$i]->getAssignedUnixName(), $art_arr[$i]->getAssignedTo(), $art_arr[$i]->getAssignedRealName()).'</td>';
+					} else {
+						echo '<td>'. $art_arr[$i]->getAssignedRealName() .'</td>';
+					}
 					break;
 				case 'submitted_by':
-					echo '<td>'. $art_arr[$i]->getSubmittedRealName() .'</td>';
+					if($art_arr[$i]->getSubmittedBy() != 100) {
+						echo '<td>'.util_display_user($art_arr[$i]->getSubmittedUnixName(), $art_arr[$i]->getSubmittedBy(), $art_arr[$i]->getSubmittedRealName()).'</td>';
+					} else {
+						echo '<td>'.$art_arr[$i]->getSubmittedRealName().'</td>';
+					}
 					break;
 				case 'last_modified_by':
-					echo '<td>'. $art_arr[$i]->getLastModifiedRealName() .'</td>';
+					if($art_arr[$i]->getLastModifiedRealName() != 100) {
+						echo '<td>'.util_display_user($art_arr[$i]->getLastModifiedUnixName(), $art_arr[$i]->getLastModifiedBy(), $art_arr[$i]->getLastModifiedRealName()).'</td>';
+					} else {
+						echo '<td>'.$art_arr[$i]->getLastModifiedRealName().'</td>';
+					}
 					break;
 				case 'close_date':
 					echo '<td>'. ($art_arr[$i]->getCloseDate() ?

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0770a75f3db8b199a09757d260dab8336682d995

commit 0770a75f3db8b199a09757d260dab8336682d995
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jan 22 12:46:33 2017 +0100

    fix PHP warning

diff --git a/src/www/widgets/updatelayout.php b/src/www/widgets/updatelayout.php
index 86855ab..7b0ab12 100644
--- a/src/www/widgets/updatelayout.php
+++ b/src/www/widgets/updatelayout.php
@@ -91,8 +91,8 @@ if ($owner) {
 			if ($request->exist('name')) {
 				$param = $request->get('name');
 				$name = array_pop(array_keys($param));
+				$instance_id = (int)$param[$name];
 			}
-			$instance_id = (int)$param[$name];
 			switch($request->get('action')) {
 				case 'widget':
 					if ($name && $request->exist('layout_id')) {

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f813bb0630b1d7c11fd1e073075f0da8379b7efa

commit f813bb0630b1d7c11fd1e073075f0da8379b7efa
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jan 22 12:46:10 2017 +0100

    use standard util_display_user

diff --git a/src/common/widget/Widget_TrackerGeneral.class.php b/src/common/widget/Widget_TrackerGeneral.class.php
index 41b0aca..9011c79 100644
--- a/src/common/widget/Widget_TrackerGeneral.class.php
+++ b/src/common/widget/Widget_TrackerGeneral.class.php
@@ -2,7 +2,7 @@
 /**
  * General Tracker Content Widget Class
  *
- * Copyright 2016, Franck Villaume - TrivialDev
+ * Copyright 2016-2017, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is a part of Fusionforge.
@@ -72,13 +72,11 @@ class Widget_TrackerGeneral extends Widget {
 			$return = $HTML->listTableTop();
 			$cells = array();
 			$cells[][] = html_e('strong', array(), _('Submitted by')._(':'));
-			$cellContent = $ah->getSubmittedRealName();
 			if($ah->getSubmittedBy() != 100) {
-				$unixName = $ah->getSubmittedUnixName();
-				$by = $ah->getSubmittedBy();
-				$cellContent .= ' ('.html_e('samp', array(), util_make_link_u($unixName, $by, $unixName)).')';
+				$cells[][] = util_display_user($ah->getSubmittedUnixName(), $ah->getSubmittedBy(), $ah->getSubmittedRealName());
+			} else {
+				$cells[][] = $ah->getSubmittedRealName();
 			}
-			$cells[][] = $cellContent;
 			$return .= $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle($i++, true)), $cells);
 			$cells = array();
 			$cells[][] = html_e('strong', array(), _('Date Submitted')._(':'));
@@ -86,13 +84,11 @@ class Widget_TrackerGeneral extends Widget {
 			$return .= $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle($i++, true)), $cells);
 			$cells = array();
 			$cells[][] = html_e('strong', array(), _('Last Modified by')._(':'));
-			$cellContent = $ah->getLastModifiedRealName();
 			if($ah->getLastModifiedBy() != 100) {
-				$unixName = $ah->getLastModifiedUnixName();
-				$by = $ah->getLastModifiedBy();
-				$cellContent .= ' ('.html_e('samp', array(), util_make_link_u($unixName, $by, $unixName)).')';
+				$cells[][] = util_display_user($ah->getLastModifiedUnixName(), $ah->getLastModifiedBy(), $ah->getLastModifiedRealName());
+			} else {
+				$cells[][] = $ah->getLastModifiedRealName();
 			}
-			$cells[][] = $cellContent;
 			$return .= $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle($i++, true)), $cells);
 			$cells = array();
 			$cells[][] = html_e('strong', array(), _('Last Modified')._(':'));

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

Summary of changes:
 src/common/tracker/actions/browse.php             | 18 +++++++++++++++---
 src/common/widget/Widget_TrackerGeneral.class.php | 18 +++++++-----------
 src/www/widgets/updatelayout.php                  |  2 +-
 3 files changed, 23 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
FusionForge