#2810

diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php
index 58f8246ba3f58fc5b33707bc41385224e0ef0c5a..03232e3859b897d7ce6566e6f0a8cdc98e671dde 100644 (file)
--- a/src/app/Magic/Fields/Field.php
+++ b/src/app/Magic/Fields/Field.php
@@ -27,7 +27,7 @@ class Field
     protected $_translatable = false;
 
     protected $_databaseAttributes = [];
-    
+
     /**
      * @param $attributes
      * @return Field
@@ -158,9 +158,9 @@ class Field
             $this->setAttributeIfNotSet('store_in', 'extras');
         }
         if ($this->hasAttribute('when')) {
-            $htmlAttributes = $this->getAttribute('attributes', []);
-            $htmlAttributes['data-when'] = json_encode($this->getAttribute('when'));
-            $this->setAttribute('attributes', $htmlAttributes);
+            $wrapperAttributes = $this->getAttribute('wrapperAttributes', []);
+            $wrapperAttributes['data-when'] = json_encode($this->getAttribute('when'));
+            $this->setAttribute('wrapperAttributes', $wrapperAttributes);
         }
     }
 }

diff --git a/src/resources/views/fields/rangeofvalues.blade.php b/src/resources/views/fields/rangeofvalues.blade.php
index 860bfd7a6fb5b12ded08502780a505b7e7bb02b6..745adbfd974dcb55c3cbde7e240375ef0f3554a4 100644 (file)
--- a/src/resources/views/fields/rangeofvalues.blade.php
+++ b/src/resources/views/fields/rangeofvalues.blade.php
@@ -1,20 +1,54 @@
 <!-- range of values -->
+<?php
+$empty = ['first' => '', 'second' => ''];
+$value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? $empty;
+if ($value == '') {
+    $value = $empty;
+}
+if (!isset($value['first'])) {
+    $value['first'] = '';
+}
+if (!isset($value['second'])) {
+    $value['second'] = '';
+}
+
+
+?>
 <div @include('crud::inc.field_wrapper_attributes') >
     <label>{!! $field['label'] !!}</label>
     <div class="rangeofvalues__wrapper">
         <div class="rangeofvalues__field">
             <label>{!! $field['first_label'] !!}</label>
-            <input @include('crud::inc.field_attributes')
-                   type="text"
-                   name="{{ $field['name'] }}[min]"
-            >
+            @if(isset($field['prefix']) || isset($field['suffix']))
+                <div class="input-group"> @endif
+                    @if(isset($field['prefix']))
+                        <div class="input-group-addon">{!! $field['prefix'] !!}</div> @endif
+                    <input @include('crud::inc.field_attributes')
+                           value="{{ $value['first'] }}"
+                           type="number"
+                           name="{{ $field['name'] }}[first]"
+                    >
+                    @if(isset($field['suffix']))
+                        <div class="input-group-addon">{!! $field['suffix'] !!}</div> @endif
+
+                    @if(isset($field['prefix']) || isset($field['suffix'])) </div> @endif
         </div>
         <div class="rangeofvalues__field">
             <label>{!! $field['second_label'] !!}</label>
-            <input @include('crud::inc.field_attributes')
-                   type="text"
-                   name="{{ $field['name'] }}[max]"
-            >
+            @if(isset($field['prefix']) || isset($field['suffix']))
+                <div class="input-group"> @endif
+                    @if(isset($field['prefix']))
+                        <div class="input-group-addon">{!! $field['prefix'] !!}</div> @endif
+
+                    <input @include('crud::inc.field_attributes')
+                           value="{{ $value['second'] }}"
+                           type="number"
+                           name="{{ $field['name'] }}[second]"
+                    >
+                    @if(isset($field['suffix']))
+                        <div class="input-group-addon">{!! $field['suffix'] !!}</div> @endif
+
+                    @if(isset($field['prefix']) || isset($field['suffix'])) </div> @endif
         </div>
     </div>
 
@@ -42,7 +76,7 @@
                 box-sizing: border-box;
             }
 
-            .rangeofvalues__field label{
+            .rangeofvalues__field label {
                 font-weight: 400;
             }