wip #4211 @1

diff --git a/src/app/CubistCrudPanel.php b/src/app/CubistCrudPanel.php
index d5acaf6ddf46f6a5a6c5eaeb19eced101cf9f771..1ed0b46cceaeb7262e8ebc367de5cb306a4678b3 100644 (file)
--- a/src/app/CubistCrudPanel.php
+++ b/src/app/CubistCrudPanel.php
@@ -153,4 +153,12 @@ class CubistCrudPanel extends CrudPanel
     {
         $this->modifyField($name, ['default' => $value, 'value' => $value]);
     }
+
+    public function getEntryOrModel()
+    {
+        if (null === $this->entry) {
+            return $this->model;
+        }
+        return $this->entry;
+    }
 }

diff --git a/src/app/Magic/Fields/FilesOrURL.php b/src/app/Magic/Fields/FilesOrURL.php
new file mode 100644 (file)
index 0000000..b5dacf3
--- /dev/null
+++ b/src/app/Magic/Fields/FilesOrURL.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Cubist\Backpack\Magic\Fields;
+
+class FilesOrURL extends Field
+{
+
+}

diff --git a/src/app/Magic/Fields/Model.php b/src/app/Magic/Fields/Model.php
index 8c207ebfca996e1e91f388eeca1011f66a0497eb..25959058e6a2e16ab25a9e4ef05c1d2b3a510370 100644 (file)
--- a/src/app/Magic/Fields/Model.php
+++ b/src/app/Magic/Fields/Model.php
@@ -37,7 +37,7 @@ class Model extends Field
                 set_time_limit(0);
                 /** @var \Illuminate\Database\Eloquent\Model $inst */
                 $inst = new $modelClass();
-                return $modelClass::withoutGlobalScopes()->get()->pluck($attr, $inst->getKeyName())->toArray();
+                return $this->getClause($modelClass::withoutGlobalScopes())->get()->pluck($attr, $inst->getKeyName())->toArray();
             });
             stop_measure($globalCacheKey);
         }
@@ -68,6 +68,15 @@ class Model extends Field
         return static::$_options[$cacheKey];
     }
 
+    /**
+     * @param $e \Illuminate\Database\Eloquent\Model
+     * @return \Illuminate\Database\Eloquent\Model
+     */
+    public function getClause($e)
+    {
+        return $e;
+    }
+
     public function getDatabaseType()
     {
         if ($this->getAttribute('allows_multiple')) {

diff --git a/src/resources/views/form/additional_edit_views.blade.php b/src/resources/views/form/additional_edit_views.blade.php
index 8a479de84a862a3858b5fb8111536cb38356c526..becef599fd0121390a43ff8c527f79cb5c96aa5e 100644 (file)
--- a/src/resources/views/form/additional_edit_views.blade.php
+++ b/src/resources/views/form/additional_edit_views.blade.php
@@ -1,3 +1,3 @@
-@foreach($crud->entry->getAdditionalEditViews() as $v)
+@foreach($crud->getEntryOrModel()->getAdditionalEditViews() as $v)
     @include($v)
 @endforeach

diff --git a/src/resources/views/form/shortcuts.blade.php b/src/resources/views/form/shortcuts.blade.php
index 18a5977f1f8f3b89e5c6d9556304314498f915aa..54b289f8e7a0b3dd7658eee1660762633d91c661 100644 (file)
--- a/src/resources/views/form/shortcuts.blade.php
+++ b/src/resources/views/form/shortcuts.blade.php
@@ -16,7 +16,7 @@
 
                 #form_shortcuts a {
                     display: block;
-                    font-size: 120%;
+                    font-size: 100%;
                     font-weight: 500;
                 }
             </style>

diff --git a/src/resources/views/track-non-default-values.blade.php b/src/resources/views/track-non-default-values.blade.php
index b6d2badd49e4505106bd59ddf21287ae7475168b..88c46cd741412c93c17ca19707845fbf0854b802 100644 (file)
--- a/src/resources/views/track-non-default-values.blade.php
+++ b/src/resources/views/track-non-default-values.blade.php
@@ -1,5 +1,7 @@
 @push('crud_fields_scripts')
     <script type="text/javascript">
+        console.log('load track-non-default-values');
+
         jQuery('document').ready(function ($) {
             $(document).on('change', 'select,input,textarea', function () {
                 $(this).closest('[data-default]').addClass('live-change')