Merge branch 'master' of github.com:jqhph/dcat-admin

jqhph · Sep 12, 2020 · 45a3ddb · 45a3ddb
2 parents 1ac1679 + 01a0a64
commit 45a3ddb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/resources/views/form/select.blade.php b/resources/views/form/select.blade.php
@@ -12,6 +12,7 @@
         <input type="hidden" name="{{$name}}"/>
 
         <select class="form-control {{$class}}" style="width: 100%;" name="{{$name}}" {!! $attributes !!} >
+            <option value=""></option>
             @if($groups)
                 @foreach($groups as $group)
                     <optgroup label="{{ $group['label'] }}">
@@ -21,7 +22,6 @@
                     </optgroup>
                 @endforeach
              @else
-                <option value=""></option>
                 @foreach($options as $select => $option)
                     <option value="{{$select}}" {{ Dcat\Admin\Support\Helper::equal($select, old($column, $value)) ?'selected':'' }}>{{$option}}</option>
                 @endforeach

diff --git a/src/Form/Field/Editor.php b/src/Form/Field/Editor.php
@@ -163,7 +163,7 @@ protected function buildSaveContentScript()
         return <<<JS
 function (editor) {
     editor.on('Change', function(e) {
-        var content = e.level.content;
+        var content = e.target.getContent();
         if (! content) {
             content = e.level.fragments;
             content = content.length && content.join('');

diff --git a/src/Repositories/EloquentRepository.php b/src/Repositories/EloquentRepository.php
@@ -778,7 +778,7 @@ protected function updateRelation(Form $form, EloquentModel $model, array $relat
 
                         $instance = $relation->findOrNew(Arr::get($related, $keyName));
 
-                        if ($related[Form::REMOVE_FLAG_NAME] == 1) {
+                        if (Arr::get($related, Form::REMOVE_FLAG_NAME) == 1) {
                             $instance->delete();
 
                             continue;