[Fusionforge-commits] FusionForge branch 6.0 updated. 82823f9 tracker: fix edit feature on artifact detail view - without rehtmlizing the description on change

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Wed Jun 3 16:48:15 CEST 2015


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, 6.0 has been updated
       via  82823f9c5bdb911090feb76c25cf1f4c5ca7e359 (commit)
      from  08a898fbff888da1d44a786b056f53c2e8c6f75d (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 82823f9c5bdb911090feb76c25cf1f4c5ca7e359
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Jun 3 16:45:35 2015 +0200

    tracker: fix edit feature on artifact detail view - without rehtmlizing the description on change

diff --git a/src/common/tracker/include/ArtifactHtml.class.php b/src/common/tracker/include/ArtifactHtml.class.php
index eb3473d..d40f359 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -36,9 +36,9 @@ class ArtifactHtml extends Artifact {
 	function showDetails($editable = false) {
 		global $HTML;
 		$result = $this->getDetails();
-		$result = util_gen_cross_ref($result, $this->ArtifactType->Group->getID());
+		$result_html = util_gen_cross_ref($result, $this->ArtifactType->Group->getID());
 		//$result = util_line_wrap( $result, 120,"\n");
-		$result = nl2br($result);
+		$result_html = nl2br($result_html);
 
 		$title_arr = array();
 		if ($editable === true) {
@@ -51,7 +51,7 @@ class ArtifactHtml extends Artifact {
 		}
 		echo $HTML->listTableTop($title_arr);
 		echo $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle(0, true), 'id' => 'editdescription', 'style' => 'display:none'), array(array(html_e('textarea', array('id' => 'tracker-description', 'required' => 'required', 'name' => 'description', 'rows' => 20, 'cols' => 79, 'title' => util_html_secure(html_get_tooltip_description('description'))), $result))));
-		echo $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle(0, true), 'id' => 'showdescription'), array(array($result)));
+		echo $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle(0, true), 'id' => 'showdescription'), array(array($result_html)));
 		echo $HTML->listTableBottom();
 	}
 

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

Summary of changes:
 src/common/tracker/include/ArtifactHtml.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/tracker/include/ArtifactHtml.class.php b/src/common/tracker/include/ArtifactHtml.class.php
index eb3473d..d40f359 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -36,9 +36,9 @@ class ArtifactHtml extends Artifact {
 	function showDetails($editable = false) {
 		global $HTML;
 		$result = $this->getDetails();
-		$result = util_gen_cross_ref($result, $this->ArtifactType->Group->getID());
+		$result_html = util_gen_cross_ref($result, $this->ArtifactType->Group->getID());
 		//$result = util_line_wrap( $result, 120,"\n");
-		$result = nl2br($result);
+		$result_html = nl2br($result_html);
 
 		$title_arr = array();
 		if ($editable === true) {
@@ -51,7 +51,7 @@ class ArtifactHtml extends Artifact {
 		}
 		echo $HTML->listTableTop($title_arr);
 		echo $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle(0, true), 'id' => 'editdescription', 'style' => 'display:none'), array(array(html_e('textarea', array('id' => 'tracker-description', 'required' => 'required', 'name' => 'description', 'rows' => 20, 'cols' => 79, 'title' => util_html_secure(html_get_tooltip_description('description'))), $result))));
-		echo $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle(0, true), 'id' => 'showdescription'), array(array($result)));
+		echo $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle(0, true), 'id' => 'showdescription'), array(array($result_html)));
 		echo $HTML->listTableBottom();
 	}
 


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list