瀏覽代碼

更改变量名称

Edwin Xu 3 年之前
父節點
當前提交
b2343be383
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 4 4
      resources/views/helpers/scaffold.blade.php
  2. 2 2
      src/Http/Controllers/ScaffoldController.php

+ 4 - 4
resources/views/helpers/scaffold.blade.php

@@ -77,7 +77,7 @@
                     <span for="inputControllerName" class="col-sm-1 control-label text-capitalize">{{(trans('admin.scaffold.controller'))}}</span>
 
                     <div class="col-sm-4">
-                        <input type="text" name="controller_name" class="form-control text-capitalize" id="inputControllerName" placeholder="{{(trans('admin.scaffold.controller'))}}" value="{{ old('controller_name', $appNamespace."\\Controllers\\") }}">
+                        <input type="text" name="controller_name" class="form-control text-capitalize" id="inputControllerName" placeholder="{{(trans('admin.scaffold.controller'))}}" value="{{ old('controller_name', $namespaceBase."\\Controllers\\") }}">
                     </div>
                 </div>
 
@@ -86,7 +86,7 @@
                     <span for="inputRepositoryName" class="col-sm-1 control-label text-capitalize">{{(trans('admin.scaffold.repository'))}}</span>
 
                     <div class="col-sm-4">
-                        <input type="text" name="repository_name" class="form-control text-capitalize" id="inputRepositoryName" placeholder="{{(trans('admin.scaffold.repository'))}}" value="{{ old('repository_name', $appNamespace."\\Repositories\\") }}">
+                        <input type="text" name="repository_name" class="form-control text-capitalize" id="inputRepositoryName" placeholder="{{(trans('admin.scaffold.repository'))}}" value="{{ old('repository_name', $namespaceBase."\\Repositories\\") }}">
                     </div>
                 </div>
 
@@ -302,8 +302,8 @@
             $fieldsBody = $('#table-fields tbody'),
             tpl = $('#table-field-tpl').html(),
             modelNamespace = 'App\\Models\\',
-            repositoryNamespace = '{{$appNamespace}}\\Repositories\\',
-            controllerNamespace = '{{$appNamespace}}\\Controllers\\',
+            repositoryNamespace = '{{ $namespaceBase }}\\Repositories\\',
+            controllerNamespace = '{{ $namespaceBase }}\\Controllers\\',
             dataTypeMap = {!! json_encode($dataTypeMap) !!},
             helpers = Dcat.helpers;
 

+ 2 - 2
src/Http/Controllers/ScaffoldController.php

@@ -78,7 +78,7 @@ class ScaffoldController extends Controller
         $dbTypes = static::$dbTypes;
         $dataTypeMap = static::$dataTypeMap;
         $action = URL::current();
-        $appNamespace = 'App\\'.implode('\\', array_map(function ($name) {
+        $namespaceBase = 'App\\'.implode('\\', array_map(function ($name) {
             return Str::studly($name);
         }, explode(DIRECTORY_SEPARATOR, ltrim(config('admin.directory'), app_path().DIRECTORY_SEPARATOR))));
         $tables = collect($this->getDatabaseColumns())->map(function ($v) {
@@ -90,7 +90,7 @@ class ScaffoldController extends Controller
             ->description(' ')
             ->body(view(
                 'admin::helpers.scaffold',
-                compact('dbTypes', 'action', 'tables', 'dataTypeMap', 'appNamespace')
+                compact('dbTypes', 'action', 'tables', 'dataTypeMap', 'namespaceBase')
             ));
     }