[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1rc1-9-g219a621

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Apr 2 12:04:08 CEST 2018


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.1 has been updated
       via  219a62163fc7bd4485bcb40b0a1461d6ea376516 (commit)
       via  04b09a26c57f35917b763ced216064377c31681a (commit)
       via  89ccee898a319650c8828b5af09a4197ce094a3e (commit)
      from  a3237f1a2b9fb61ace9e7ec087949561e852e481 (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=219a62163fc7bd4485bcb40b0a1461d6ea376516

commit 219a62163fc7bd4485bcb40b0a1461d6ea376516
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Apr 2 12:03:51 2018 +0200

    Survey: fix bar graph

diff --git a/src/www/survey/include/SurveyHTML.class.php b/src/www/survey/include/SurveyHTML.class.php
index b39f71b..00d8f98 100644
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@ -762,14 +762,14 @@ class SurveyHTML extends FFError {
 				$ret .= 'var plot'.$id.';';
 				$yMax = 0;
 				for ($i = 0; $i < count($values); $i++) {
-					$ret .= 'data'.$id.'.push(['.$values[$i].']);';
+					$ret .= 'data'.$id.'.push('.$values[$i].');';
 					if ($yMax < $values[$i]) {
 						$yMax = $values[$i];
 					}
 					$ret .= 'ticks'.$id.'.push([\''.htmlentities($legend[$i]).'\']);';
 				}
 				$ret .= 'jQuery(document).ready(function(){
-						plot'.$id.' = jQuery.jqplot (\'chart'.$id.'\', data'.$id.',
+						plot'.$id.' = jQuery.jqplot (\'chart'.$id.'\', [data'.$id.'],
 						{
 							axesDefaults: {
 								tickRenderer: jQuery.jqplot.CanvasAxisTickRenderer,

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

commit 04b09a26c57f35917b763ced216064377c31681a
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Apr 2 12:03:33 2018 +0200

    Strings

diff --git a/src/www/survey/admin/show_results.php b/src/www/survey/admin/show_results.php
index a0b758c..aafbf44 100644
--- a/src/www/survey/admin/show_results.php
+++ b/src/www/survey/admin/show_results.php
@@ -52,7 +52,6 @@ if (!$g || !is_object($g) || $g->isError()) {
 	exit_no_group();
 }
 
-$is_admin_page='y';
 $sh = new  SurveyHtml();
 
 html_use_jqueryjqplotpluginCanvas();
@@ -75,11 +74,11 @@ if ($survey_id) {
 	$s = new Survey($g, $survey_id);
 
 	if (!$s || !is_object($s)) {
-		echo $HTML->error_msg(_('Error'). ' ' . _('Cannot get Survey'));
+		echo $HTML->error_msg(_('Error')._(': ')._('Cannot get Survey'));
 		$sh->footer();
 		exit;
 	} elseif ( $s->isError()) {
-		echo $HTML->error_msg(_('Error'). $s->getErrorMessage());
+		echo $HTML->error_msg(_('Error')._(': ').$s->getErrorMessage());
 		$sh->footer();
 		exit;
 	}
@@ -90,15 +89,15 @@ if ($survey_id) {
 		/* Create a Survey Question for general purpose */
 		$sq = new SurveyQuestion($g, $question_id);
 		if (!$sq || !is_object($sq)) {
-			echo $HTML->error_msg(_('Error'). ' ' . _('Cannot get Survey Question'));
+			echo $HTML->error_msg(_('Error')._(': ')._('Cannot get Survey Question'));
 		} elseif ($sq->isError()) {
-			echo $HTML->error_msg(_('Error'). $sq->getErrorMessage());
+			echo $HTML->error_msg(_('Error')._(': ').$sq->getErrorMessage());
 		} else {
 			showResult($sh, $s, $sq, 1, 0, $graph);
 		}
 
 	} else {
-		echo '<h2>'.$s->getTitle().' ('. $s->getNumberOfVotes() .' ' . _("Votes") . ')'. '</h2>';
+		echo html_e('h2', array(),$s->getTitle().' ('. $s->getNumberOfVotes() .' ' . _("Votes") . ')');
 
 		/* Get questions of this survey */
 		$questions = $s->getQuestionInstances();

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

commit 89ccee898a319650c8828b5af09a4197ce094a3e
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Apr 2 11:41:46 2018 +0200

    survey: fix csv with debug enable

diff --git a/src/www/survey/admin/show_csv.php b/src/www/survey/admin/show_csv.php
index 7ded894..1c0cf4c 100644
--- a/src/www/survey/admin/show_csv.php
+++ b/src/www/survey/admin/show_csv.php
@@ -66,7 +66,7 @@ if ($survey_id) {
 
 	/* Get questions of this survey */
 	$questions = & $s->getQuestionInstances();
-	foreach ($questions as $cur_question){
+	foreach ($questions as $cur_question) {
 		$qid = $cur_question->getID();
 		$lib = $cur_question->getQuestion();
 		$type = $cur_question->getQuestionType();
@@ -87,23 +87,24 @@ if ($survey_id) {
 			print "\n".'<table border="1">'."\n";
 			print "<tr>";
 			//print "<td>User</td>";
-			foreach ($header as $id=>$col){
+			foreach ($header as $id=>$col) {
 				print "<td>$col</td>";
 			}
 			print "</tr>\n";
-			foreach ($s2 as $k=>$val){
+			foreach ($s2 as $k=>$val) {
 				print "<tr>";
 				//print "<td>$k</td>";
 				$val = array_reverse($val);
-				foreach ($val as $k1=>$val1){
+				foreach ($val as $k1=>$val1) {
 			 		$res = format($val1,$types[$k1]);
 					print "<td>$res</td>";
-		        }
+				}
 				print "</tr>\n";
 			}
 			print "</table>";
 			$sh->footer();
 		} else {
+			$sysdebug_enable = false;
 			// CSV mode
 			header('Content-type: text/csv');
 			list($year, $month) = explode('-', date('Y-m'));
@@ -116,8 +117,8 @@ if ($survey_id) {
 			foreach ($s2 as $k=>$val){
 				echo "\n";
 			    	foreach ($header as $id=>$col){
-			    	$res = format($val[$id],$types[$id]);
-			    	echo '"'.$res.'";';
+					$res = format($val[$id],$types[$id]);
+					echo '"'.$res.'";';
 				}
 			}
 		}

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

Summary of changes:
 src/www/survey/admin/show_csv.php           | 15 ++++++++-------
 src/www/survey/admin/show_results.php       | 11 +++++------
 src/www/survey/include/SurveyHTML.class.php |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list