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 f11fb2d37cb716c1844ef28db4c6d9923c9bc4aa (commit)
from ad9a0db57ed054d6433fd3154f42c91290800ffb (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=f11fb2d37cb716c1844ef28db4c6d9923c9bc4aa
commit f11fb2d37cb716c1844ef28db4c6d9923c9bc4aa
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Mar 6 10:19:00 2017 +0100
No space at EOL
diff --git a/src/common/tracker/ArtifactExpression.class.php
b/src/common/tracker/ArtifactExpression.class.php
index 6f7d811..4f348ef 100644
--- a/src/common/tracker/ArtifactExpression.class.php
+++ b/src/common/tracker/ArtifactExpression.class.php
@@ -25,7 +25,7 @@ require_once $gfcommon.'include/FFError.class.php';
require_once $gfwww.'include/expression.php';
class ArtifactExpression extends FFError {
-
+
private $expression;
private $arithmeticOperators = array (
array('=','Assignment','a = b'),
@@ -55,19 +55,19 @@ class ArtifactExpression extends FFError {
private $otherOperators = array(
array('?:','Conditional operator','a ? b : c')
);
-
+
private $functionsDescription = array();
-
+
public function __construct()
{
$this->functionsDescription = array('in_array'=>_('Test if a
value is in an (json) array'));
-
+
$this->expression = new Expression;
$this->expression->suppress_errors = true;
$this->expression->fb = array();
$this->expression->functions ['in_array'] = 'expr_in_array';
}
-
+
public function evaluate($expression) {
$return = null;
$this->clearError();
@@ -83,21 +83,21 @@ class ArtifactExpression extends FFError {
}
return $return;
}
-
+
public function getVariables() {
return $this->expression->vars();
}
-
+
public function getFunctions () {
$builtInFunctions = $this->expression->fb;
$customFunctions = array_keys($this->expression->functions);
return array_merge($builtInFunctions, $customFunctions);
}
-
+
public function getUserDefineFunctions () {
return array_keys($this->expression->f);
}
-
+
public function getOperators() {
return array(
array(_('Arithmetic
operators'), $this->arithmeticOperators),
@@ -106,12 +106,12 @@ class ArtifactExpression extends FFError {
array(_('Other operators'),
$this->otherOperators)
);
}
-
+
public function getFunctionDescription($function) {
return $this->functionsDescription[$function];
}
}
function expr_in_array($value, $jsonArray) {
$array = json_decode($jsonArray, true);
- return in_array($value, $array);
-}
\ No newline at end of file
+ return in_array($value, $array);
+}
diff --git a/src/common/tracker/views/form-editformula.php
b/src/common/tracker/views/form-editformula.php
index c92fe7b..e1032ee 100644
--- a/src/common/tracker/views/form-editformula.php
+++ b/src/common/tracker/views/form-editformula.php
@@ -91,7 +91,7 @@ if ($rows > 0) {
$cells[] = array($eftypes[$efarr[$i]['field_type']],
'class'=>'align-right');
//$id=str_replace('@','',$efarr[$i]['alias']);
-
+
/*
List of possible options for a user built
Selection Box
*/
@@ -113,7 +113,7 @@ if ($rows > 0) {
}
}
*/
-
+
$content = '';
if (!empty($elearray)) {
$optrows=count($elearray);
@@ -131,10 +131,10 @@ if ($rows > 0) {
}
$content .= html_e('br');
}
- }
-
+ }
+
$cells[] = array($content,
'class'=>'align-right');
-
+
echo $HTML->multiTableRow($row_attrs, $cells);
}
echo $HTML->listTableBottom();
diff --git
a/src/plugins/taskboard/common/include/TaskBoardFactoryHtml.class.php
b/src/plugins/taskboard/common/include/TaskBoardFactoryHtml.class.php
index a0be611..0f9b27d 100644
--- a/src/plugins/taskboard/common/include/TaskBoardFactoryHtml.class.php
+++ b/src/plugins/taskboard/common/include/TaskBoardFactoryHtml.class.php
@@ -24,7 +24,7 @@ require_once
$gfplugins.'taskboard/common/TaskBoardFactory.class.php';
class TaskBoardFactoryHtml extends TaskBoardFactory {
function header($params=array()) {
global $HTML;
-
+
if (!forge_get_config('use_tracker')) {
exit_disabled();
}
diff --git a/src/plugins/taskboard/www/index.php
b/src/plugins/taskboard/www/index.php
index 09f453c..26239e2 100644
--- a/src/plugins/taskboard/www/index.php
+++ b/src/plugins/taskboard/www/index.php
@@ -49,12 +49,12 @@ if (!$group_id) {
if ( ! ($group->usesPlugin($pluginTaskboard->name))) {//check if the
group has the plugin active
exit_error(sprintf(_('First activate the %s plugin through the
Project\'s Admin Interface'),$pluginTaskboard->name),'home');
}
-
+
if ($taskboard_id) {
include $gfplugins.'taskboard/common/views/taskboard.php';
-
+
} else {
include $gfplugins.'taskboard/common/views/ind.php';
-
+
}
}
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/ArtifactExpression.class.php | 24 +++++++++++-----------
src/common/tracker/views/form-editformula.php | 10 ++++-----
.../common/include/TaskBoardFactoryHtml.class.php | 2 +-
src/plugins/taskboard/www/index.php | 6 +++---
4 files changed, 21 insertions(+), 21 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
