diff --git a/src/Plugin/Field/FieldWidget/WeightSelectorWidget.php b/src/Plugin/Field/FieldWidget/WeightSelectorWidget.php index e6fc285..9cc4363 100644 --- a/src/Plugin/Field/FieldWidget/WeightSelectorWidget.php +++ b/src/Plugin/Field/FieldWidget/WeightSelectorWidget.php @@ -33,24 +33,11 @@ class WeightSelectorWidget extends WidgetBase { $element += array( '#type' => 'select', - '#options' => $this->rangeOptions($range), + '#options' => \Drupal::service('weight.range_service')->rangeOptions($range), '#default_value' => $value, ); return array('value' => $element); } - /** - * Get weight range options. - */ - public function rangeOptions($range) { - $options = array(); - - for ($i = -$range; $i <= $range; $i++) { - $options[$i] = $i; - } - - return $options; - } - } diff --git a/src/Plugin/views/field/WeightSelector.php b/src/Plugin/views/field/WeightSelector.php index f632956..d656017 100644 --- a/src/Plugin/views/field/WeightSelector.php +++ b/src/Plugin/views/field/WeightSelector.php @@ -64,7 +64,7 @@ class WeightSelector extends FieldPluginBase { '#tree' => TRUE, ]; - $options = WeightSelectorWidget::rangeOptions($this->options['range']); + $options = \Drupal::service('weight.range_service')->rangeOptions($this->options['range']); // At this point, the query has already been run, // so we can access the results. diff --git a/src/WeightRangeService.php b/src/WeightRangeService.php new file mode 100644 index 0000000..8377489 --- /dev/null +++ b/src/WeightRangeService.php @@ -0,0 +1,23 @@ +