bug fixes

Author: Shunmugam

README.md

@@ -24,9 +24,15 @@
 <tr><td>5.5</td><td>>=2.1</td></tr>
 <tr><td>5.6</td><td>>=2.1</td></tr>
 <tr><td>5.7</td><td>>=2.1</td></tr>
+<tr><td>5.8</td><td>>=2.2</td></tr>
 </tbody>
 </table>
 <h1>Change Logs</h1>
+<h3>Version v2.2</h3>
+<ol>
+  <li>Data table version update</li>
+  <li>Bug fix</li>
+</ol>
 <h3>Version v2.1.1</h3>
 <ol>
 <li>CRUD Module added<br />
@@ -52,7 +58,7 @@
 <ol>
   <li>Laravel 5.4 or later</li>
   <li>laravelcollective/html: ~5.0</li>
-  <li>yajra/laravel-datatables-oracle: 7.2</li>
+  <li>yajra/laravel-datatables-oracle: ~9.0</li>
   <li>unisharp/laravel-filemanager: ^1.8</li>
 </ol>
 
@@ -70,6 +76,7 @@
         'Cms' => Ramesh\Cms\Facades\Cms::class,<br>
   </li>
   <li>run   php artisan vendor:publish          (Publishing css,js,config files,core modules,theme,etc)</li>
+  <li>run   php artisan vendor:publish --provider="UniSharp\LaravelFilemanager\LaravelFilemanagerServiceProvider"       (Publishing filemanager resources)</li>
 
 
 

src/stubs/cms/core/admin/Controllers/AdminAuth.php

@@ -50,7 +50,7 @@ public function dologin(Request $request)
             return redirect()->route('backenddashboard');
         }
         else
-            return redirect()->to($this->getRedirectUrl())
+            return redirect()->back()
                 ->withInput($request->input())
                 ->withErrors(['Wrong Information']);
     }

src/stubs/module/Models/Model.stub

@@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model;
 
 class {class} extends Model
 {
-    //
+    protected $table = "{table}";
 }

src/stubs/module/Providers/provider.stub

@@ -25,11 +25,11 @@ class {class} extends ServiceProvider
     public function register()
     {
 
-           // $this->registerViews();
-            //$this->registerRoot();
-            //$this->registerAdminRoot();
-            //$this->registerMiddleware();
-
+       // $this->registerViews();
+        //$this->registerRoot();
+        //$this->registerAdminRoot();
+        //$this->registerMiddleware();
+        //$this->registerApiRoutes();
     }
 
     public function registerRoot()
@@ -39,8 +39,8 @@ class {class} extends ServiceProvider
             ->namespace('cms\{module}\Controllers')
             ->group(__DIR__ . '/../routes.php');
 
-
     }
+
     public function registerAdminRoot()
     {
 
@@ -49,7 +49,6 @@ class {class} extends ServiceProvider
             ->namespace('cms\{module}\Controllers')
             ->group(__DIR__ . '/../adminroutes.php');
 
-
     }
 
     /**
@@ -82,4 +81,15 @@ class {class} extends ServiceProvider
         app('router')->aliasMiddleware('MiddleWareName', middlewarepath::class);
     }
 
+    /*
+     * register api routes
+     */
+    public function registerApiRoutes() {
+
+        Route::prefix('api')
+            ->middleware(['UserAuthForApi'])
+            ->namespace('cms\{module}\Controllers')
+            ->group(__DIR__ . '/../apiroutes.php');
+    }
+
 }

src/stubs/module/resources/views/admin/edit.blade.stub

@@ -21,7 +21,7 @@
             {{ Form::button('<i class="glyphicon glyphicon-refresh"></i>&nbsp;&nbsp;&nbsp;Clear', ['type' => 'reset','class' => 'mybuttn btn btn-sm btn-dafault pull-right btn-right-spacing']) }}
         </div>
 
-        <span class="section">Country Info</span>
+        <span class="section">{module} Info</span>
         <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
             <div class="item form-group">
                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="name">Name <span class="required">*</span>