ipl: fix SelectElement callback, Table cleanup

This commit is contained in:
Thomas Gelf 2018-06-23 09:07:07 +02:00
parent 88f7dc0d0f
commit e6563b9882
2 changed files with 5 additions and 13 deletions

View File

@ -11,12 +11,12 @@ class SelectElement extends BaseFormElement
public function __construct($name, $attributes = null) public function __construct($name, $attributes = null)
{ {
parent::__construct($name, $attributes);
$this->getAttributes()->registerAttributeCallback( $this->getAttributes()->registerAttributeCallback(
'options', 'options',
null, null,
[$this, 'setOptions'] [$this, 'setOptions']
); );
parent::__construct($name, $attributes);
} }
/** /**

View File

@ -46,7 +46,6 @@ class Table extends BaseHtmlElement
* *
* @param $content * @param $content
* @return $this * @return $this
* @throws \Icinga\Exception\IcingaException
*/ */
public function setCaption($content) public function setCaption($content)
{ {
@ -98,7 +97,6 @@ class Table extends BaseHtmlElement
* @param null $attributes * @param null $attributes
* @param string $tag * @param string $tag
* @return HtmlElement * @return HtmlElement
* @throws \Icinga\Exception\IcingaException
*/ */
public static function row($row, $attributes = null, $tag = 'td') public static function row($row, $attributes = null, $tag = 'td')
{ {
@ -116,7 +114,6 @@ class Table extends BaseHtmlElement
/** /**
* @return HtmlElement * @return HtmlElement
* @throws \Icinga\Exception\IcingaException
*/ */
public function generateHeader() public function generateHeader()
{ {
@ -127,7 +124,6 @@ class Table extends BaseHtmlElement
/** /**
* @return HtmlElement * @return HtmlElement
* @throws \Icinga\Exception\IcingaException
*/ */
public function generateFooter() public function generateFooter()
{ {
@ -139,7 +135,6 @@ class Table extends BaseHtmlElement
/** /**
* @param HtmlElement $parent * @param HtmlElement $parent
* @return HtmlElement * @return HtmlElement
* @throws \Icinga\Exception\IcingaException
*/ */
protected function addHeaderColumnsTo(HtmlElement $parent) protected function addHeaderColumnsTo(HtmlElement $parent)
{ {
@ -161,6 +156,7 @@ class Table extends BaseHtmlElement
} }
/** /**
* @deprecated
* @param array $columns * @param array $columns
* @return $this * @return $this
*/ */
@ -172,9 +168,9 @@ class Table extends BaseHtmlElement
} }
/** /**
* @deprecated
* @param $row * @param $row
* @return HtmlElement * @return HtmlElement
* @throws \Icinga\Exception\IcingaException
*/ */
public function renderRow($row) public function renderRow($row)
{ {
@ -198,10 +194,10 @@ class Table extends BaseHtmlElement
} }
/** /**
* @deprecated
* @param HtmlElement $tr * @param HtmlElement $tr
* @param $row * @param $row
* @return HtmlElement * @return HtmlElement
* @throws \Icinga\Exception\IcingaException
*/ */
public function addRowClasses(HtmlElement $tr, $row) public function addRowClasses(HtmlElement $tr, $row)
{ {
@ -214,9 +210,9 @@ class Table extends BaseHtmlElement
} }
/** /**
* @deprecated
* @param Traversable $rows * @param Traversable $rows
* @return HtmlDocument|HtmlElement * @return HtmlDocument|HtmlElement
* @throws \Icinga\Exception\IcingaException
*/ */
public function renderRows(Traversable $rows) public function renderRows(Traversable $rows)
{ {
@ -254,7 +250,6 @@ class Table extends BaseHtmlElement
/** /**
* @return HtmlElement * @return HtmlElement
* @throws \Icinga\Exception\IcingaException
*/ */
public function footer() public function footer()
{ {
@ -267,7 +262,6 @@ class Table extends BaseHtmlElement
/** /**
* @return HtmlElement * @return HtmlElement
* @throws \Icinga\Exception\IcingaException
*/ */
public function nextBody() public function nextBody()
{ {
@ -281,7 +275,6 @@ class Table extends BaseHtmlElement
/** /**
* @return HtmlElement * @return HtmlElement
* @throws \Icinga\Exception\IcingaException
*/ */
public function nextHeader() public function nextHeader()
{ {
@ -295,7 +288,6 @@ class Table extends BaseHtmlElement
/** /**
* @return string * @return string
* @throws \Icinga\Exception\IcingaException
*/ */
public function renderContent() public function renderContent()
{ {