Merge pull request #5 from shunnmugam/develop

Develop
shunnmugam · Apr 7, 2019 · f36b4bc · f36b4bc
2 parents 6652e64 + e8a28bf
commit f36b4bc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/CmsServiceProvider.php b/src/CmsServiceProvider.php
@@ -64,7 +64,7 @@ public function register()
         $this->app->register(ModuleServiceProvider::class);
         $this->app->register(CommandProvider::class);
 
-        include('Helper.php');
+        include_once('Helper.php');
 
     }
 

diff --git a/src/stubs/cms/core/admin/module.json b/src/stubs/cms/core/admin/module.json
@@ -1,6 +1,6 @@
 {
   "name": "admin",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type" : "core",
   "providers": [
     "providers\\AdminServiceProvider"

diff --git a/src/stubs/cms/core/admin/resources/views/login.blade.php b/src/stubs/cms/core/admin/resources/views/login.blade.php
@@ -7,7 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Laravel Cms | Administrator </title>
+    <title>{{isset(Configurations::getConfig('site')->site_name) ? Configurations::getConfig('site')->site_name : '' }} | Administrator </title>
 
     <!-- Bootstrap -->
     {!!Cms::style('theme/vendors/bootstrap/dist/css/bootstrap.min.css')!!}

diff --git a/src/stubs/cms/local/theme1/locations/Controllers/StateController.php b/src/stubs/cms/local/theme1/locations/Controllers/StateController.php
@@ -89,7 +89,7 @@ public function show($id)
     public function edit($id)
     {
         $obj = StatesModel::findOrFail($id);
-        $countries = CountriesModel::orderBy('name')->pluck('name');
+        $countries = CountriesModel::orderBy('name')->pluck('name','id');
         return view('locations::admin.state.edit',['layout'=>'edit','data'=>$obj,'countries'=>$countries]);
     }
 

diff --git a/src/stubs/cms/local/theme1/locations/module.json b/src/stubs/cms/local/theme1/locations/module.json
@@ -1,6 +1,6 @@
 {
   "name": "locations",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type" : "local",
   "providers": [
     "Providers\\LocationsServiceProvider"