From 543c8370736397c3430924de4db299bb4ae91187 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 7 Jun 2019 15:49:29 +0200
Subject: [PATCH] #2783

---
 src/CubistBackpackServiceProvider.php         |  6 +-
 src/app/Magic/Fields/Field.php                |  9 ++-
 src/app/Magic/Fields/Range.php                |  4 +-
 .../views/fields/relation_table.blade.php     | 56 -------------------
 4 files changed, 13 insertions(+), 62 deletions(-)
 delete mode 100644 src/resources/views/fields/relation_table.blade.php

diff --git a/src/CubistBackpackServiceProvider.php b/src/CubistBackpackServiceProvider.php
index 4bb6564..6b6e222 100644
--- a/src/CubistBackpackServiceProvider.php
+++ b/src/CubistBackpackServiceProvider.php
@@ -15,6 +15,8 @@ class CubistBackpackServiceProvider extends ServiceProvider
      */
     protected $defer = false;
 
+    const NAMESPACE = 'cubist_back';
+
 
     /**
      * Perform post-registration booting of services.
@@ -23,11 +25,11 @@ class CubistBackpackServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->loadTranslationsFrom(__DIR__ . '/resources/lang', 'cubist_back');
+        $this->loadTranslationsFrom(__DIR__ . '/resources/lang', self::NAMESPACE);
         foreach (glob(__DIR__ . '/routes/cubist/backpack/*.php') as $filename) {
             $this->loadRoutesFrom($filename);
         }
-        $this->loadViewsFrom(__FILE__ . '/resources/views', 'cubist_back');
+        $this->loadViewsFrom(__FILE__ . '/resources/views', self::NAMESPACE);
     }
 
 
diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php
index a1c5072..58f8246 100644
--- a/src/app/Magic/Fields/Field.php
+++ b/src/app/Magic/Fields/Field.php
@@ -15,16 +15,19 @@ class Field
     protected $_attributes;
     protected $_rules = [];
     protected $_columnType = 'text';
+
     protected $_adminType = 'text';
+    protected $_viewNamespace = 'crud::fields';
+
     protected $_databaseType = 'text';
-    protected $_cast = false;
     protected $_databaseUnique = false;
     protected $_databaseIndex = false;
+
+    protected $_cast = false;
     protected $_translatable = false;
-    protected $_viewNamespace = 'crud::fields';
 
     protected $_databaseAttributes = [];
-
+    
     /**
      * @param $attributes
      * @return Field
diff --git a/src/app/Magic/Fields/Range.php b/src/app/Magic/Fields/Range.php
index 8715bbc..b537d7f 100644
--- a/src/app/Magic/Fields/Range.php
+++ b/src/app/Magic/Fields/Range.php
@@ -4,8 +4,10 @@
 namespace Cubist\Backpack\app\Magic\Fields;
 
 
+use Cubist\Backpack\CubistBackpackServiceProvider;
+
 class Range extends Field
 {
     protected $_adminType = 'rangeofvalues';
-    protected $_viewNamespace = 'cubist_back::fields';
+    protected $_viewNamespace = CubistBackpackServiceProvider::NAMESPACE . '::fields';
 }
diff --git a/src/resources/views/fields/relation_table.blade.php b/src/resources/views/fields/relation_table.blade.php
deleted file mode 100644
index 69d61ff..0000000
--- a/src/resources/views/fields/relation_table.blade.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-if ($field['value'] == "")
-    return;
-$crud->route = $field['route'];
-?>
-
-<div @include('crud::inc.field_wrapper_attributes') >
-    <h3 style="margin-top:0">{!! $field['label'] !!}</h3>
-
-    <div class="array-container form-group">
-
-        <table class="table table-bordered table-striped m-b-0">
-            <thead>
-            <tr>
-                @foreach( $field['columns'] as $column )
-                    <th>
-                        {{ __($column['label']) }}
-                    </th>
-                @endforeach
-                <th data-orderable="false">{{ trans('backpack::crud.actions') }}</th>
-            </tr>
-            </thead>
-            <tbody class="table-striped">
-            @foreach( $field['value'] as $item)
-                <tr class="array-row">
-                    @foreach( $field['columns'] as $key => $column)
-                        <td>
-                            {!! $item->{$column['name']} !!}
-                        </td>
-                    @endforeach
-                    <td>
-                        @include('crud::buttons.update', ['entry' => $item])
-                        @include('crud::buttons.delete', ['entry' => $item])
-                    </td>
-                </tr>
-            @endforeach
-            </tbody>
-        </table>
-
-        @php
-            // Add relation entity
-            $reflection = new ReflectionClass(get_class($crud->getModel()));
-            $classname = strtolower($reflection->getShortName());
-
-            $url = "{$crud->route}/create?$classname={$crud->entry->id}";
-        @endphp
-
-        <div class="array-controls btn-group m-t-10">
-            <a href="{{ $url }}">
-                <button class="btn btn-sm btn-default" type="button"><i
-                        class="fa fa-plus"></i> {{trans('backpack::crud.add')}}</button>
-            </a>
-        </div>
-
-    </div>
-</div>
-- 
2.39.5