fix(profile): Fixed error on saving profile data

anibalealvarezs · Feb 11, 2022 · ef4d10a · ef4d10a
1 parent dd21137
commit ef4d10a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/src/Commands/PbAltInstallCommand.php b/src/Commands/PbAltInstallCommand.php
@@ -19,7 +19,6 @@ class PbAltInstallCommand extends Command
                             {--update : pachage will be updated before installation}
                             {--publish : Resources will be published to the application}
                             {--migrate : Migrations will be run}
-                            {--reset : Migrations will be removed from migrations directory}
                             {--seed : Tables will be seeded}
                             {--config : Application wil be configured}
                             {--link : Links will be created}

diff --git a/src/Commands/PbInstallCommand.php b/src/Commands/PbInstallCommand.php
@@ -20,7 +20,6 @@ class PbInstallCommand extends Command
                             {--update : pachage will be updated before installation}
                             {--publish : Resources will be published to the application}
                             {--migrate : Migrations will be run}
-                            {--reset : Migrations will be removed from migrations directory}
                             {--seed : Tables will be seeded}
                             {--config : Application wil be configured}
                             {--link : Links will be created}

diff --git a/src/Controllers/Fortify/PbProfileInformationController.php b/src/Controllers/Fortify/PbProfileInformationController.php
@@ -26,7 +26,7 @@ public function update(Request $request,
     {
         $updater->update($request->user(), $request->all());
 
-        $current = app(PbCurrentUser::class);
+        $current = PbUser::find($request->user()->id);
         if ($language = PbLanguage::find($request->input('language'))) {
             $current->language_id = $language->id;
             $request->session()->put('locale', $language->code);

diff --git a/src/Controllers/PbBuilderController.php b/src/Controllers/PbBuilderController.php
@@ -159,7 +159,7 @@ public function store(Request $request): Redirector|RedirectResponse|Application
             $model = $this->processModelRequests($this->vars->validationRules, $request, $this->vars->replacers,
                 (new $this->vars->level->modelPath())->setLocale(app()->getLocale()));
             // Check if module relation exists
-            if ($model->hasRelation('module') && $request->input('module') &&  $module = PbModule::find($request->input('module'))) {
+            if ($model->hasRelation('module') && ($request->input('module') > 0) &&  $module = PbModule::find($request->input('module'))) {
                 $model->module()->associate($module);
             }
             // Model save
@@ -268,7 +268,7 @@ public function update(Request $request, int $id): Redirector|RedirectResponse|A
             // Build requests
             $requests = $this->processModelRequests($this->vars->validationRules, $request, $this->vars->replacers);
             // Check if module relation exists
-            if ($model->hasRelation('module') && $request->input('module') &&  $module = PbModule::find($request->input('module'))) {
+            if ($model->hasRelation('module') && ($request->input('module') > 0) &&  $module = PbModule::find($request->input('module'))) {
                 $model->module()->associate($module);
             }
             // Model update

diff --git a/src/Controllers/Permission/PbPermissionController.php b/src/Controllers/Permission/PbPermissionController.php
@@ -135,7 +135,7 @@ public function store(Request $request): Redirector|RedirectResponse|Application
             // Add additional fields values
             $model->guard_name = 'admin';
             // Check if module relation exists
-            if ($model->hasRelation('module') && $request->input('module') &&  $module = PbModule::find($request->input('module'))) {
+            if ($model->hasRelation('module') && ($request->input('module') > 0) &&  $module = PbModule::find($request->input('module'))) {
                 $model->module()->associate($module);
             }
             // Model save
@@ -226,7 +226,7 @@ public function update(Request $request, int $id): Redirector|RedirectResponse|A
             // Build requests
             $requests = $this->processModelRequests($this->vars->validationRules, $request, $this->vars->replacers);
             // Check if module relation exists
-            if ($model->hasRelation('module') && $request->input('module') &&  $module = PbModule::find($request->input('module'))) {
+            if ($model->hasRelation('module') && ($request->input('module') > 0) &&  $module = PbModule::find($request->input('module'))) {
                 $model->module()->associate($module);
             }
             // Model update