Actualizaciones menores

llstarscreamll · Oct 5, 2016 · 51f6926 · 51f6926
1 parent 99e0bc0
commit 51f6926
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 9 deletions.
diff --git a/src/Providers/RouteGenerator.php b/src/Providers/RouteGenerator.php
@@ -92,7 +92,7 @@ public function generateRoute()
         // restaurar archivos de papelera
         if ($this->hasDeletedAtColumn($this->fields)) {
 
-            $restore_route = "Route::put(\n\t'/{$this->route()}/restore/{{$this->modelClassName()}}',\n\t[\n\t'as'    =>  '{$this->route()}.restore',\n\t'uses'  =>  '{$this->controllerClassName()}@restore'\n\t]\n);\n";
+            $restore_route = "Route::put(\n\t'/{$this->route()}/restore/{{$this->table_name}}',\n\t[\n\t'as'    =>  '{$this->route()}.restore',\n\t'uses'  =>  '{$this->controllerClassName()}@restore'\n\t]\n);\n";
             $route = $restore_route.$route;
 
         }

diff --git a/src/Resources/Views/GeneratorTemplates/model.blade.php b/src/Resources/Views/GeneratorTemplates/model.blade.php
@@ -147,6 +147,8 @@ public static function findRequested($request)
         // ordenamos los resultados
         $request->get('sort') and $query->orderBy($request->get('sort'), $request->get('sortType', 'asc'));
 
+        !$request->has('sort') and $query->orderBy('created_at', 'desc');
+
         // paginamos los resultados
         return $query->paginate(15);
     }

diff --git a/src/Resources/Views/GeneratorTemplates/pageObjects/Create.blade.php b/src/Resources/Views/GeneratorTemplates/pageObjects/Create.blade.php
@@ -50,7 +50,6 @@ class {{$test}} extends Base
 
     public function __construct(\FunctionalTester $I)
     {
-        $this->functionalTester = $I;
         parent::__construct($I);
 
         $this->initUIMap();

diff --git a/src/Resources/Views/GeneratorTemplates/pageObjects/Delete.blade.php b/src/Resources/Views/GeneratorTemplates/pageObjects/Delete.blade.php
@@ -47,7 +47,6 @@ class {{$test}} extends Base
 
     public function __construct(\FunctionalTester $I)
     {
-        $this->functionalTester = $I;
         parent::__construct($I);
 
         self::$deleteBtn = [

diff --git a/src/Resources/Views/GeneratorTemplates/pageObjects/Edit.blade.php b/src/Resources/Views/GeneratorTemplates/pageObjects/Edit.blade.php
@@ -47,7 +47,6 @@ class {{$test}} extends Base
 
     public function __construct(\FunctionalTester $I)
     {
-        $this->functionalTester = $I;
         parent::__construct($I);
 
         self::$linkToEdit = [

diff --git a/src/Resources/Views/GeneratorTemplates/pageObjects/Index.blade.php b/src/Resources/Views/GeneratorTemplates/pageObjects/Index.blade.php
@@ -35,7 +35,6 @@ class {{$test}} extends Base
 
     public function __construct(\FunctionalTester $I)
     {
-        $this->functionalTester = $I;
         parent::__construct($I);
 
         self::$title = [

diff --git a/src/Resources/Views/GeneratorTemplates/pageObjects/Show.blade.php b/src/Resources/Views/GeneratorTemplates/pageObjects/Show.blade.php
@@ -35,7 +35,6 @@ class {{$test}} extends Base
 
     public function __construct(\FunctionalTester $I)
     {
-        $this->functionalTester = $I;
         parent::__construct($I);
 
         self::$title = [

diff --git a/src/Resources/Views/GeneratorTemplates/views/create.php b/src/Resources/Views/GeneratorTemplates/views/create.php
@@ -27,7 +27,7 @@
                 @include ('<?=config('llstarscreamll.CrudGenerator.config.layout-namespace')?>layout.notifications')
             </div>
 
-            <div class="panel-body">
+            <div class="box-body">
 
                 {!! Form::open(['route' => '<?=$gen->route()?>.store', 'method' => 'POST', 'name' => 'create-<?=$gen->getDashedModelName()?>-form']) !!}
 

diff --git a/src/Resources/Views/GeneratorTemplates/views/edit.php b/src/Resources/Views/GeneratorTemplates/views/edit.php
@@ -27,7 +27,7 @@
                 @include ('<?=config('llstarscreamll.CrudGenerator.config.layout-namespace')?>layout.notifications')
             </div>
 
-            <div class="panel-body">
+            <div class="box-body">
 
                 {!! Form::model($<?=$gen->modelVariableName()?>, ['route' => ['<?=$gen->route()?>.update', $<?=$gen->modelVariableName()?>->id], 'method' => 'PUT', 'name' => 'edit-<?=$gen->getDashedModelName()?>-form']) !!}
 

diff --git a/src/Resources/Views/GeneratorTemplates/views/show.php b/src/Resources/Views/GeneratorTemplates/views/show.php
@@ -27,7 +27,7 @@
                 @include ('<?=config('llstarscreamll.CrudGenerator.config.layout-namespace')?>layout.notifications')
             </div>
 
-            <div class="panel-body">
+            <div class="box-body">
 
                 {!! Form::model($<?=$gen->modelVariableName()?>, ['name' => 'show-<?=$gen->getDashedModelName()?>-form', 'data-show' => ($show = true)]) !!}