mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-13 17:09:46 +01:00
Code Issues Releases Wiki Activity

Fixes #4394 '__tabs__' was being displayed in custom fields form. Test added.

Browse Source
This commit is contained in:
Cameron 2021-02-18 10:27:59 -08:00
parent 2f08384dcb
commit 0db4b1164f
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
e107_handlers/e_customfields_class.php
View File

@ -67,7 +67,14 @@
if(is_array($data))
{
if(isset($data['__tabs__']))
{
$this->_tab = $data['__tabs__'];
unset($data['__tabs__']);
}
$this->_config = $data;
return $this;
}
@ -305,6 +312,7 @@
public function renderConfigForm($name)
{
$frm = e107::getForm();
$curVal = $this->_config;
$value = array();
@ -320,7 +328,6 @@
}
}
$text = "
<div class='form-group'>
".$frm->text('__e_customfields_tabs__', $this->_tab[$this->_tab_default], 30, array('placeholder' => 'Tab label', 'size' =>'medium', 'required' =>1))."

14
e107_tests/tests/unit/e_customfieldsTest.php
View File

@ -17,7 +17,7 @@
protected $config = '{
"__tabs__": {
"extra": "My Tab"
"additional": "My Tab"
},
"image": {
"title": "Image",
@ -191,6 +191,8 @@
$this->fail("Couldn't load e_customfields object");
}
$this->cf->__construct();
setlocale(LC_TIME, 'C');
date_default_timezone_set('UTC');
@ -313,12 +315,18 @@
{
}
*/
public function testRenderConfigForm()
{
$this->cf->loadConfig($this->config)->loadData($this->data);
$tab = $this->cf->getTabId();
$this->assertSame('additional', $tab);
$result= $this->cf->renderConfigForm('custom');
$this->assertStringNotContainsString('__tab__', $result);
}
/*
public function testGetFieldValue()
{