Merge branch '4.5' into 4

This commit is contained in:
Robbie Averill 2018-02-05 12:10:34 +13:00
commit f348590cbe

View File

@ -74,10 +74,15 @@ class EditableFormHeading extends EditableFormField
// Since this field expects raw html, safely escape the user data prior // Since this field expects raw html, safely escape the user data prior
$field->setRightTitle(Convert::raw2xml($this->RightTitle)); $field->setRightTitle(Convert::raw2xml($this->RightTitle));
} }
// if this field has an extra class // if this field has an extra class
if ($this->ExtraClass) { if ($this->ExtraClass) {
$field->addExtraClass($this->ExtraClass); $field->addExtraClass($this->ExtraClass);
} }
if (!$this->ShowOnLoad) {
$field->addExtraClass($this->ShowOnLoadNice());
}
} }
public function showInReports() public function showInReports()
@ -95,6 +100,11 @@ class EditableFormHeading extends EditableFormField
return "$(\":header[data-id='{$this->Name}']\")"; return "$(\":header[data-id='{$this->Name}']\")";
} }
public function getSelectorOnly()
{
return "[data-id={$this->Name}]";
}
public function getLevel() public function getLevel()
{ {
return $this->getField('Level') ?: 3; return $this->getField('Level') ?: 3;