blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-03 20:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
alex
2018-02-23 10:06:56 +01:00
parent 53fcda3504 75d1a60401
commit 93a581e301
2 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/infocenter/infocenterData.php
+1 -3
View File
@@ -154,10 +154,8 @@
if ($datasetRaw->LockDate != '')
{
return true;
return FilterWidget::DEFAULT_MARK_ROW_CLASS;
}
return false;
}
);
application/widgets/FilterWidget.php
+1 -29
View File
@@ -14,7 +14,6 @@ class FilterWidget extends Widget
const ADDITIONAL_COLUMNS = 'additionalColumns';
const FORMAT_RAW = 'formatRaw';
const MARK_ROW = 'markRow';
const ALTERNATIVE_MARK_ROW_CLASS = 'alternativeMarkRowClass';
const CHECKBOXES = 'checkboxes';
const HIDE_HEADER = 'hideHeader';
const HIDE_SAVE = 'hideSave';
@@ -73,7 +72,6 @@ class FilterWidget extends Widget
private $additionalColumns;
private $formatRaw;
private $markRow;
private $alternativeMarkRowClass;
private $checkboxes;
private $columnsAliases;
private $filterName;
@@ -409,21 +407,9 @@ class FilterWidget extends Widget
if (is_object($datasetRaw))
{
$markRow = self::$FilterWidgetInstance->getMarkRow();
if ($markRow != null)
{
if ($markRow($datasetRaw) === true)
{
$alternativeMarkRowClass = self::$FilterWidgetInstance->getAlternativeMarkRowClass();
if ($alternativeMarkRowClass != null)
{
$class = $alternativeMarkRowClass;
}
else
{
$class = self::DEFAULT_MARK_ROW_CLASS;
}
}
$class = $markRow($datasetRaw);
}
}
@@ -483,14 +469,6 @@ class FilterWidget extends Widget
return $this->markRow;
}
/**
*
*/
protected function getAlternativeMarkRowClass()
{
return $this->alternativeMarkRowClass;
}
/**
*
*/
@@ -652,7 +630,6 @@ class FilterWidget extends Widget
$this->additionalColumns = null;
$this->formatRaw = null;
$this->markRow = null;
$this->alternativeMarkRowClass = null;
$this->checkboxes = null;
$this->hideHeader = false;
$this->hideSave = false;
@@ -723,11 +700,6 @@ class FilterWidget extends Widget
$this->markRow = $args[self::MARK_ROW];
}
if (isset($args[self::ALTERNATIVE_MARK_ROW_CLASS]) && $args[self::ALTERNATIVE_MARK_ROW_CLASS] != '')
{
$this->alternativeMarkRowClass = $args[self::ALTERNATIVE_MARK_ROW_CLASS];
}
if (isset($args[self::CHECKBOXES])
&& is_array($args[self::CHECKBOXES])
&& count($args[self::CHECKBOXES]) > 0)