diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index ce47fd36b..ea44841bb 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -343,7 +343,8 @@ return [
'email' => 'Email'
],
'filter' => [
- 'all' => 'all'
+ 'all' => 'all',
+ 'options_method_not_exists' => "The model class :model must define a method :method() returning options for the ':filter' filter."
],
'import_export' => [
'upload_csv_file' => '1. Upload a CSV file',
diff --git a/modules/backend/widgets/Filter.php b/modules/backend/widgets/Filter.php
index 4e674cdb6..30d5dd53a 100644
--- a/modules/backend/widgets/Filter.php
+++ b/modules/backend/widgets/Filter.php
@@ -1,6 +1,8 @@
setScopeValue($scope, $checked);
break;
+
+ case 'switch':
+ $value = post('value');
+ $this->setScopeValue($scope, $value);
+ break;
}
/*
@@ -179,12 +186,12 @@ class Filter extends WidgetBase
*/
protected function getAvailableOptions($scope, $searchQuery = null)
{
- if (count($scope->options)) {
- return $scope->options;
+ if ($scope->options) {
+ return $this->getOptionsFromArray($scope, $searchQuery);
}
$available = [];
- $nameColumn = $this->getScopeNameColumn($scope);
+ $nameColumn = $this->getScopeNameFrom($scope);
$options = $this->getOptionsFromModel($scope, $searchQuery);
foreach ($options as $option) {
$available[$option->getKey()] = $option->{$nameColumn};
@@ -216,6 +223,7 @@ class Filter extends WidgetBase
/**
* Looks at the model for defined scope items.
+ * @return Collection
*/
protected function getOptionsFromModel($scope, $searchQuery = null)
{
@@ -232,10 +240,97 @@ class Filter extends WidgetBase
return $query->get();
}
- $searchFields = [$model->getKeyName(), $this->getScopeNameColumn($scope)];
+ $searchFields = [$model->getKeyName(), $this->getScopeNameFrom($scope)];
return $query->searchWhere($searchQuery, $searchFields)->get();
}
+ /**
+ * Look at the defined set of options for scope items, or the model method.
+ * @return array
+ */
+ protected function getOptionsFromArray($scope, $searchQuery = null)
+ {
+ /*
+ * Load the data
+ */
+ $options = $scope->options;
+
+ if (is_scalar($options)) {
+ $model = $this->scopeModels[$scope->scopeName];
+ $methodName = $options;
+
+ if (!$model->methodExists($methodName)) {
+ throw new ApplicationException(Lang::get(
+ 'backend::lang.filter.options_method_not_exists',
+ ['model'=>get_class($model), 'method'=>$methodName, 'filter'=>$scope->scopeName]
+ ));
+ }
+
+ $options = $model->$methodName();
+ }
+ elseif (!is_array($options)) {
+ $options = [];
+ }
+
+ /*
+ * Apply the search
+ */
+ $searchQuery = Str::lower($searchQuery);
+ if (strlen($searchQuery)) {
+ $options = $this->filterOptionsBySearch($options, $searchQuery);
+ }
+
+ return $options;
+ }
+
+ /**
+ * Filters an array of options by a search term.
+ * @param array $options
+ * @param string $query
+ * @return array
+ */
+ protected function filterOptionsBySearch($options, $query)
+ {
+ $filteredOptions = [];
+
+ $optionMatchesSearch = function($words, $option) {
+ foreach ($words as $word) {
+ $word = trim($word);
+ if (!strlen($word)) {
+ continue;
+ }
+
+ if (!Str::contains(Str::lower($option), $word)) {
+ return false;
+ }
+ }
+
+ return true;
+ };
+
+ /*
+ * Exact
+ */
+ foreach ($options as $index => $option) {
+ if (Str::is(Str::lower($option), $query)) {
+ $filteredOptions[$index] = $option;
+ unset($options[$index]);
+ }
+ }
+
+ /*
+ * Fuzzy
+ */
+ $words = explode(' ', $query);
+ foreach ($options as $index => $option) {
+ if ($optionMatchesSearch($words, $option)) {
+ $filteredOptions[$index] = $option;
+ }
+ }
+
+ return $filteredOptions;
+ }
+
/**
* Creates a flat array of filter scopes from the configuration.
*/
@@ -362,6 +457,15 @@ class Filter extends WidgetBase
* Condition
*/
if ($scopeConditions = $scope->conditions) {
+
+ /*
+ * Switch scope: multiple conditions, value either 1 or 2
+ */
+ if (is_array($scopeConditions)) {
+ $conditionNum = is_array($value) ? 0 : $value - 1;
+ list($scopeConditions) = array_slice($scopeConditions, $conditionNum);
+ }
+
if (is_array($value)) {
$filtered = implode(',', array_build($value, function ($key, $_value) {
return [$key, Db::getPdo()->quote($_value)];
@@ -444,7 +548,7 @@ class Filter extends WidgetBase
* @param string $scope
* @return string
*/
- public function getScopeNameColumn($scope)
+ public function getScopeNameFrom($scope)
{
if (is_string($scope)) {
$scope = $this->getScope($scope);
diff --git a/modules/backend/widgets/filter/partials/_scope_switch.htm b/modules/backend/widgets/filter/partials/_scope_switch.htm
new file mode 100644
index 000000000..0a9bf2df4
--- /dev/null
+++ b/modules/backend/widgets/filter/partials/_scope_switch.htm
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/modules/backend/widgets/form/partials/_field_checkboxlist.htm b/modules/backend/widgets/form/partials/_field_checkboxlist.htm
index 78508b84e..836d682ba 100644
--- a/modules/backend/widgets/form/partials/_field_checkboxlist.htm
+++ b/modules/backend/widgets/form/partials/_field_checkboxlist.htm
@@ -1,6 +1,7 @@
options();
$checkedValues = (array) $field->value;
+ $isScrollable = count($fieldOptions) > 10;
?>
previewMode && $field->value): ?>
@@ -34,8 +35,8 @@
previewMode && count($fieldOptions)): ?>
-
- 10): ?>
+
+
:
@@ -76,7 +77,7 @@
- 10): ?>
+