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 4cc46b6973c4c6ff6f11ff6b4d9011e36c945248 (commit)
from 1243fb5c979b6932c647569ae57ca0939b5a2b1a (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=4cc46b6973c4c6ff6f11ff6b4d9011e36c945248
commit 4cc46b6973c4c6ff6f11ff6b4d9011e36c945248
Author: Stéphane-Eymeric Bredthauer <[email protected]>
Date: Fri Nov 18 17:11:08 2016 +0100
Tracker: Renaming a few constants
diff --git a/src/common/tracker/ArtifactExtraField.class.php
b/src/common/tracker/ArtifactExtraField.class.php
index 600c6eb..13bf5fe 100644
--- a/src/common/tracker/ArtifactExtraField.class.php
+++ b/src/common/tracker/ArtifactExtraField.class.php
@@ -47,11 +47,11 @@ define('ARTIFACT_EXTRAFIELDTYPE_USER',14);
/* 15: reserved MULTIUSER */
define('ARTIFACT_EXTRAFIELDTYPE_RELEASE',16);
-define ("ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE", serialize (array
(ARTIFACT_EXTRAFIELDTYPE_SELECT, ARTIFACT_EXTRAFIELDTYPE_RADIO,
ARTIFACT_EXTRAFIELDTYPE_STATUS)));
-define ("ARTIFACT_EXTRAFIELDTYPE_MULTICHOICETYPE", serialize (array
(ARTIFACT_EXTRAFIELDTYPE_CHECKBOX, ARTIFACT_EXTRAFIELDTYPE_MULTISELECT)));
-define ("ARTIFACT_EXTRAFIELDTYPE_CHOICETYPE", serialize
(array_merge(unserialize(ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE),
unserialize(ARTIFACT_EXTRAFIELDTYPE_MULTICHOICETYPE))));
-define ("ARTIFACT_EXTRAFIELDTYPE_SPECALCHOICETYPE",
serialize(array(ARTIFACT_EXTRAFIELDTYPE_USER,
ARTIFACT_EXTRAFIELDTYPE_RELEASE)));
-define ("ARTIFACT_EXTRAFIELDTYPE_VALUETYPE", serialize (array
(ARTIFACT_EXTRAFIELDTYPE_TEXT,ARTIFACT_EXTRAFIELDTYPE_TEXTAREA,ARTIFACT_EXTRAFIELDTYPE_RELATION,ARTIFACT_EXTRAFIELDTYPE_INTEGER,ARTIFACT_EXTRAFIELDTYPE_FORMULA,ARTIFACT_EXTRAFIELDTYPE_DATETIME)));
+define ("ARTIFACT_EXTRAFIELDTYPEGROUP_SINGLECHOICE", serialize (array
(ARTIFACT_EXTRAFIELDTYPE_SELECT, ARTIFACT_EXTRAFIELDTYPE_RADIO,
ARTIFACT_EXTRAFIELDTYPE_STATUS)));
+define ("ARTIFACT_EXTRAFIELDTYPEGROUP_MULTICHOICE", serialize (array
(ARTIFACT_EXTRAFIELDTYPE_CHECKBOX, ARTIFACT_EXTRAFIELDTYPE_MULTISELECT)));
+define ("ARTIFACT_EXTRAFIELDTYPEGROUP_CHOICE", serialize
(array_merge(unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SINGLECHOICE),
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_MULTICHOICE))));
+define ("ARTIFACT_EXTRAFIELDTYPEGROUP_SPECALCHOICE",
serialize(array(ARTIFACT_EXTRAFIELDTYPE_USER,
ARTIFACT_EXTRAFIELDTYPE_RELEASE)));
+define ("ARTIFACT_EXTRAFIELDTYPEGROUP_VALUE", serialize (array
(ARTIFACT_EXTRAFIELDTYPE_TEXT,ARTIFACT_EXTRAFIELDTYPE_TEXTAREA,ARTIFACT_EXTRAFIELDTYPE_RELATION,ARTIFACT_EXTRAFIELDTYPE_INTEGER,ARTIFACT_EXTRAFIELDTYPE_FORMULA,ARTIFACT_EXTRAFIELDTYPE_DATETIME)));
class ArtifactExtraField extends FFError {
@@ -494,7 +494,7 @@ class ArtifactExtraField extends FFError {
function setDefaultValues($default) {
$type = $this->getType();
$return = true;
- if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_MULTICHOICETYPE))) {
+ if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_MULTICHOICE))) {
if (is_array($default)) {
$efValues = $this->getAvailableValues();
$oldDefault = $this->getDefaultValues();
@@ -544,7 +544,7 @@ class ArtifactExtraField extends FFError {
$this->setError(_('Unable to set default
value')._(':').$default);
$return = false;
}
- } elseif (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE))) {
+ } elseif (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SINGLECHOICE))) {
if (is_integer($default)) {
if ($default == '100') {
$return = $this->resetDefaultValues();
@@ -566,8 +566,8 @@ class ArtifactExtraField extends FFError {
$this->setError(_('Unable to set default
value')._(':').$default);
$return = false;
}
- } elseif (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_VALUETYPE)) || in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_SPECALCHOICETYPE))) {
- if
(in_array($type,unserialize(ARTIFACT_EXTRAFIELDTYPE_SPECALCHOICETYPE)) &&
$default=='100' ||
+ } elseif (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_VALUE)) || in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SPECALCHOICE))) {
+ if
(in_array($type,unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SPECALCHOICE)) &&
$default=='100' ||
$type==ARTIFACT_EXTRAFIELDTYPE_INTEGER
&& $default=='0' ||
$type==ARTIFACT_EXTRAFIELDTYPE_TEXT &&
trim($default)=='' ||
$type==ARTIFACT_EXTRAFIELDTYPE_TEXTAREA
&& trim($default)=='') {
@@ -619,7 +619,7 @@ class ArtifactExtraField extends FFError {
$res = db_query_params ('SELECT default_value FROM
artifact_extra_field_default WHERE extra_field_id=$1',
array ($this->getID()));
$type = $this->getType();
- if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_VALUETYPE))) {
+ if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_VALUE))) {
$row = db_fetch_array($res);
$return = $row['default_value'];
if (is_null($return) && $type ==
ARTIFACT_EXTRAFIELDTYPE_INTEGER) {
@@ -636,7 +636,7 @@ class ArtifactExtraField extends FFError {
} else {
$return = (integer)$row['default_value'];
}
- } elseif (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE))) {
+ } elseif (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SINGLECHOICE))) {
$row = db_fetch_array($res);
if (!$row) {
if ($this->getShow100()) {
@@ -647,7 +647,7 @@ class ArtifactExtraField extends FFError {
} else {
$return = (integer)$row['default_value'];
}
- } elseif (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_MULTICHOICETYPE))) {
+ } elseif (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_MULTICHOICE))) {
$return = array();
while ($row = db_fetch_array($res)) {
$return[] = $row['default_value'];
@@ -696,7 +696,7 @@ class ArtifactExtraField extends FFError {
*/
function getAvailableValues() {
$type = $this->getType();
- if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_VALUETYPE))) {
+ if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_VALUE))) {
$return = array();;
} else {
$res = db_query_params ('SELECT *, 0 AS is_default
@@ -707,14 +707,14 @@ class ArtifactExtraField extends FFError {
$default = $this->getDefaultValues();
$return = array();
- if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE))) {
+ if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SINGLECHOICE))) {
while ($row = db_fetch_array($res)) {
if ($row['element_id']==$default) {
$row['is_default']=1;
}
$return[] = $row;
}
- } elseif (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_MULTICHOICETYPE))) {
+ } elseif (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_MULTICHOICE))) {
while ($row = db_fetch_array($res)) {
if
(in_array($row['element_id'],$default)) {
$row['is_default']=1;
diff --git a/src/common/tracker/ArtifactExtraFieldElement.class.php
b/src/common/tracker/ArtifactExtraFieldElement.class.php
index 4ea0226..a784cfc 100644
--- a/src/common/tracker/ArtifactExtraFieldElement.class.php
+++ b/src/common/tracker/ArtifactExtraFieldElement.class.php
@@ -140,7 +140,7 @@ class ArtifactExtraFieldElement extends FFError {
if ($is_default) {
$type = $this->ArtifactExtraField->getType();
- if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE))) {
+ if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SINGLECHOICE))) {
$result = db_query_params ('DELETE FROM
artifact_extra_field_default WHERE extra_field_id = $1',
array
($this->ArtifactExtraField->getID()));
if (!$result) {
@@ -315,7 +315,7 @@ class ArtifactExtraFieldElement extends FFError {
return false;
}
} elseif (!$this->isDefault() && $is_default) {
- if (in_array($this->ArtifactExtraField->getType(),
unserialize(ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE))) {
+ if (in_array($this->ArtifactExtraField->getType(),
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SINGLECHOICE))) {
$result = db_query_params ('DELETE FROM
artifact_extra_field_default WHERE extra_field_id = $1',
array
($this->ArtifactExtraField->getID()));
if (!$result) {
diff --git a/src/common/tracker/ArtifactType.class.php
b/src/common/tracker/ArtifactType.class.php
index 2e8eb14..6c3b4a6 100644
--- a/src/common/tracker/ArtifactType.class.php
+++ b/src/common/tracker/ArtifactType.class.php
@@ -685,7 +685,7 @@ class ArtifactType extends FFError {
if (!is_null($defaultValue)) {
$efDefaultValue [$efID] = $defaultValue;
} else {
- if
(in_array($efArr['field_type'],unserialize(ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE)))
{
+ if
(in_array($efArr['field_type'],unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SINGLECHOICE)))
{
$efDefaultValue [$efID] = '';
}
}
@@ -764,7 +764,7 @@ class ArtifactType extends FFError {
//
// Iterate the elements
//
- if (in_array($ef['field_type'],
unserialize(ARTIFACT_EXTRAFIELDTYPE_CHOICETYPE))) {
+ if (in_array($ef['field_type'],
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_CHOICE))) {
$elements =
$this->getExtraFieldElements($ef['extra_field_id']);
foreach ($elements as $el) {
//new element
@@ -816,7 +816,7 @@ class ArtifactType extends FFError {
$nef = new ArtifactExtraField($this, $newEFId);
// clone default value
$type = $oef->getType();
- if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_VALUETYPE)) || $type ==
ARTIFACT_EXTRAFIELDTYPE_USER) {
+ if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_VALUE)) || $type ==
ARTIFACT_EXTRAFIELDTYPE_USER) {
$default = $oef->getDefaultValues();
if (($type==ARTIFACT_EXTRAFIELDTYPE_INTEGER &&
$default != 0)) {
$nef->setDefaultValues($default);
diff --git a/src/common/tracker/actions/admin-updates.php
b/src/common/tracker/actions/admin-updates.php
index 86edb5e..6497101 100644
--- a/src/common/tracker/actions/admin-updates.php
+++ b/src/common/tracker/actions/admin-updates.php
@@ -636,7 +636,7 @@ if (getStringFromRequest('add_extrafield')) {
} elseif ($ac->isError()) {
$error_msg .= $ac->getErrorMessage();
} else {
- if (in_array($ac->getType(),
unserialize(ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE))) {
+ if (in_array($ac->getType(),
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SINGLECHOICE))) {
$is_default = getIntFromRequest('is_default');
} else {
$is_default = getArrayFromRequest('is_default');
diff --git a/src/common/tracker/views/form-addextrafieldoption.php
b/src/common/tracker/views/form-addextrafieldoption.php
index 8dbbe4c..e1cbfb7 100644
--- a/src/common/tracker/views/form-addextrafieldoption.php
+++ b/src/common/tracker/views/form-addextrafieldoption.php
@@ -111,12 +111,12 @@ if (!$ac || !is_object($ac)) {
}
$title_arr[]=_('Up/Down positions');
$title_arr[]=_('Elements Defined');
- if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPE_CHOICETYPE))) {
+ if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_CHOICE))) {
$title_arr[]=_('Default');
}
$title_arr[]='';
echo $HTML->listTableTop ($title_arr,false, '
');
- if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPE_CHOICETYPE))) {
+ if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_CHOICE))) {
$row_attrs =
array('class'=>$HTML->boxGetAltRowStyle(-1,true));
$cells = array();
$cells[] = array('',
'class'=>'align-right');
@@ -125,7 +125,7 @@ if (!$ac || !is_object($ac)) {
}
$cells[] = array('',
'class'=>'align-center');
$cells[] = array(_('None'));
- if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPE_MULTICHOICETYPE))) {
+ if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_MULTICHOICE))) {
$defaultValues =
$ac->getDefaultValues();
if (is_array($defaultValues)) {
if (in_array('100',
$defaultValues)) {
@@ -140,7 +140,7 @@ if (!$ac || !is_object($ac)) {
$content =
html_build_checkbox('is_default[100]', false, false);
}
}
- } elseif (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE))) {
+ } elseif (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_SINGLECHOICE))) {
$defaultValues =
$ac->getDefaultValues();
if ($defaultValues == 100) {
$content =
html_build_radio_button('is_default', 100, true);
@@ -164,10 +164,9 @@ if (!$ac || !is_object($ac)) {
$content .=
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid.'&id='.$efearr[$i]['element_id'].'&updownorder_opt=1&new_pos='.(($i
== $rows - 1)? $i + 1 : $i + 2),
html_image('ic/btn_down.png','19','18',array('alt'=>'Down', 'title'=>_('Move
Down this custom field element'))));
$cells[] = array($content,
'class'=>'align-center');
$cells[] =
array($efearr[$i]['element_name']);
- if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPE_MULTICHOICETYPE))) {
+ if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_MULTICHOICE))) {
$content =
html_build_checkbox('is_default['. $efearr[$i]['element_id'] .']', false,
$efearr[$i]['is_default']);
$cells[] = array($content,
'class'=>'align-center');
- } elseif (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE))) {
$content =
html_build_radio_button('is_default', $efearr[$i]['element_id'],
$efearr[$i]['is_default']);
$cells[] = array($content,
'class'=>'align-center');
}
@@ -185,7 +184,7 @@ if (!$ac || !is_object($ac)) {
}
$content = html_e('input',
array('type'=>'submit', 'name'=>'post_changes_alphaorder',
'value'=>_('Alphabetical order')));
$cells[] = array($content,
'class'=>'align-left');
- if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPE_CHOICETYPE))) {
+ if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_CHOICE))) {
$content = html_e('input',
array('type'=>'submit', 'name'=>'post_changes_default', 'value'=>_('Update
default')));
$cells[] = array($content,
'class'=>'align-center');
}
diff --git a/src/common/tracker/views/form-updateextrafieldelement.php
b/src/common/tracker/views/form-updateextrafieldelement.php
index 3857aeb..cac96c3 100644
--- a/src/common/tracker/views/form-updateextrafieldelement.php
+++ b/src/common/tracker/views/form-updateextrafieldelement.php
@@ -56,7 +56,7 @@ if (!$ac || !is_object($ac)) {
echo html_ao('p');
echo html_e('label', array('for'=>'name'), html_e('strong',
array(), _('Element')._(':')).html_e('br'));
echo html_e('input', array('type'=>'text', 'id'=>'name',
'name'=>'name', 'value'=>$ao->getName()));
- if (in_array($ef_type,
unserialize(ARTIFACT_EXTRAFIELDTYPE_CHOICETYPE))) {
+ if (in_array($ef_type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_CHOICE))) {
echo html_build_checkbox('is_default', false,
$ao->isDefault());
echo html_e('label', array('for'=>'is_default'),
_('Default value'));
}
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/ArtifactExtraField.class.php | 30 +++++++++++-----------
.../tracker/ArtifactExtraFieldElement.class.php | 4 +--
src/common/tracker/ArtifactType.class.php | 6 ++---
src/common/tracker/actions/admin-updates.php | 2 +-
.../tracker/views/form-addextrafieldoption.php | 13 +++++-----
.../tracker/views/form-updateextrafieldelement.php | 2 +-
6 files changed, 28 insertions(+), 29 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
