From 02380bb325e790784c77285bccca20315704a8a2 Mon Sep 17 00:00:00 2001 From: vohoangnhat Date: Mon, 27 May 2024 15:29:26 +0700 Subject: [PATCH 1/2] Issue 1460 password could not be changed https://github.com/exceedone/exment/issues/1460 --- src/Form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Form.php b/src/Form.php index dc6f32c14..064cabb64 100644 --- a/src/Form.php +++ b/src/Form.php @@ -1046,7 +1046,7 @@ protected function updateRelation($relationsData) $parent->save(); // When in creating, associate two models - $foreignKeyMethod = (app()->version() < '5.8.0') ? 'getForeignKey' : 'getForeignKeyName'; + $foreignKeyMethod = version_compare(app()->version(), '5.8.0', '<') ? 'getForeignKey' : 'getForeignKeyName'; if (!$this->model->{$relation->{$foreignKeyMethod}()}) { $this->model->{$relation->{$foreignKeyMethod}()} = $parent->getKey(); From 19d16697975f7b3c72782b140a05940a1eb67c41 Mon Sep 17 00:00:00 2001 From: vohoangnhat Date: Wed, 29 May 2024 10:02:08 +0700 Subject: [PATCH 2/2] Fix version compare --- src/Grid/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Grid/Model.php b/src/Grid/Model.php index d3c27d9cb..5c19d1ca4 100644 --- a/src/Grid/Model.php +++ b/src/Grid/Model.php @@ -758,7 +758,7 @@ protected function joinParameters(Relation $relation) $relatedTable = $relation->getRelated()->getTable(); if ($relation instanceof BelongsTo) { - $foreignKeyMethod = (app()->version() < '5.8.0') ? 'getForeignKey' : 'getForeignKeyName'; + $foreignKeyMethod = version_compare(app()->version(), '5.8.0', '<') ? 'getForeignKey' : 'getForeignKeyName'; return [ $relatedTable,