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 82ae48f98cfd001646f9a6ddd6c1a2d0ce07de9d (commit)
via 453ba8a7f07d91ae6363aa265f1f5734fbadb6f9 (commit)
from f2e87c26dd59136e307886721912a4a97f80da82 (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=82ae48f98cfd001646f9a6ddd6c1a2d0ce07de9d
commit 82ae48f98cfd001646f9a6ddd6c1a2d0ce07de9d
Author: Stéphane-Eymeric Bredthauer <[email protected]>
Date: Mon Jun 6 13:57:04 2016 +0200
Tracker: Add description (help text) for custom fields, fix (again) Use of
undefined constant size
diff --git a/src/common/tracker/views/form-updateextrafield.php
b/src/common/tracker/views/form-updateextrafield.php
index b9afa9f..c547e4d 100644
--- a/src/common/tracker/views/form-updateextrafield.php
+++ b/src/common/tracker/views/form-updateextrafield.php
@@ -61,23 +61,23 @@ if (!$ac || !is_object($ac)) {
echo html_ao('p');
if ($ac->getType() == ARTIFACT_EXTRAFIELDTYPE_TEXTAREA) {
echo html_e('label', array('for'=>'attribute1'), html_e('b',
array(), _('Text Area Columns')).html_e('br'));
- echo html_e('input', array('type'=>'text', 'id'=>'attribute1',
'name'=>'attribute1', 'value'=>$ac->getAttribute1(), size=>'2',
'maxlength'=>'2'));
+ echo html_e('input', array('type'=>'text', 'id'=>'attribute1',
'name'=>'attribute1', 'value'=>$ac->getAttribute1(), 'size'=>'2',
'maxlength'=>'2'));
echo html_ac(html_ap() - 1);
echo html_ao('p');
echo html_e('label', array('for'=>'attribute2'), html_e('b',
array(), _('Text Area Columns')).html_e('br'));
- echo html_e('input', array('type'=>'text', 'id'=>'attribute2',
'name'=>'attribute2', 'value'=>$ac->getAttribute2(), size=>'2',
'maxlength'=>'2'));
+ echo html_e('input', array('type'=>'text', 'id'=>'attribute2',
'name'=>'attribute2', 'value'=>$ac->getAttribute2(), 'size'=>'2',
'maxlength'=>'2'));
} elseif ($ac->getType() == ARTIFACT_EXTRAFIELDTYPE_TEXT ||
$ac->getType() == ARTIFACT_EXTRAFIELDTYPE_RELATION) {
echo html_e('label', array('for'=>'attribute1'), html_e('b',
array(), _('Text Field Size')).html_e('br'));
- echo html_e('input', array('type'=>'text', 'id'=>'attribute1',
'name'=>'attribute1', 'value'=>$ac->getAttribute1(), size=>'2',
'maxlength'=>'2'));
+ echo html_e('input', array('type'=>'text', 'id'=>'attribute1',
'name'=>'attribute1', 'value'=>$ac->getAttribute1(), 'size'=>'2',
'maxlength'=>'2'));
echo html_ac(html_ap() - 1);
echo html_ao('p');
echo html_e('label', array('for'=>'attribute2'), html_e('b',
array(), _('Text Field Maxlength')).html_e('br'));
- echo html_e('input', array('type'=>'text', 'id'=>'attribute2',
'name'=>'attribute2', 'value'=>$ac->getAttribute2(), size=>'2',
'maxlength'=>'2'));
+ echo html_e('input', array('type'=>'text', 'id'=>'attribute2',
'name'=>'attribute2', 'value'=>$ac->getAttribute2(), 'size'=>'2',
'maxlength'=>'2'));
if ($ac->getType() == ARTIFACT_EXTRAFIELDTYPE_TEXT) {
echo html_ac(html_ap() - 1);
echo html_ao('p');
echo html_e('label', array('for'=>'pattern'),
html_e('b', array(), _('Text Field Pattern')).html_e('br'));
- echo html_e('input', array('type'=>'text',
'id'=>'pattern', 'name'=>'pattern', 'value'=>$ac->getPattern(), size=>'80',
'maxlength'=>'255'));
+ echo html_e('input', array('type'=>'text',
'id'=>'pattern', 'name'=>'pattern', 'value'=>$ac->getPattern(), 'size'=>'80',
'maxlength'=>'255'));
}
} else {
echo html_e('input', array('type'=>'hidden',
'name'=>'attribute1', 'value'=>'0'));
@@ -87,13 +87,13 @@ if (!$ac || !is_object($ac)) {
echo html_ac(html_ap() - 1);
echo html_ao('p');
echo html_e('label', array('for'=>'show100label'), html_e('b',
array(), _('Label for the none value')).html_e('br'));
- echo html_e('input', array('type'=>'text',
'name'=>'show100label', 'value'=>$ac->getShow100label(), size=>'30'));
+ echo html_e('input', array('type'=>'text',
'name'=>'show100label', 'value'=>$ac->getShow100label(), 'size'=>'30'));
}
echo html_ac(html_ap() - 1);
echo html_ao('p');
echo html_e('label', array('for'=>'alias'), html_e('strong', array(),
_('Field alias')._(':')).html_e('br'));
- echo html_e('input', array('type'=>'text', 'id'=>'alias',
'name'=>'alias', 'value'=>$ac->getAlias(), size=>'15', 'maxlength'=>'30'));
+ echo html_e('input', array('type'=>'text', 'id'=>'alias',
'name'=>'alias', 'value'=>$ac->getAlias(), 'size'=>'15', 'maxlength'=>'30'));
echo html_ac(html_ap() - 1);
echo html_ao('p');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=453ba8a7f07d91ae6363aa265f1f5734fbadb6f9
commit 453ba8a7f07d91ae6363aa265f1f5734fbadb6f9
Author: Stéphane-Eymeric Bredthauer <[email protected]>
Date: Sat Jun 4 19:20:56 2016 +0200
Tracker: Fix crash on artifact creation due to Extra Field Type User
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 91a3387..1943dbc 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -596,7 +596,7 @@ class ArtifactTypeHtml extends ArtifactType {
*/
function renderUserField
($extra_field_id,$checked='xzxz',$show_100=false,$text_100='none',$show_any=false,$text_any='Any',
$allowed=false, $attrs = array ()) {
if ($text_100 == 'none' || $text_100 == 'nobody'){
- $text_100=_('NoBody');
+ $text_100=_('Nobody');
}
$arr = $this->getExtraFieldElements($extra_field_id);
$selectedRolesId = array();
@@ -612,7 +612,7 @@ class ArtifactTypeHtml extends ArtifactType {
}
}
}
- if (!isset($userArray[$checked])) {
+ if (is_integer($checked) && !isset($userArray[$checked])) {
$checkedUser = user_get_object($checked);
$userArray[$checkedUser->getID()] =
$checkedUser->getRealName().' '._('[DELETED]');
}
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/include/ArtifactTypeHtml.class.php | 4 ++--
src/common/tracker/views/form-updateextrafield.php | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
