Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix custom key routing #30

Merged
merged 4 commits into from
May 26, 2021
Merged

fix custom key routing #30

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dca430c
fix custom key routing
ahmedbally May 25, 2021
95810d5
fix space after ,
ahmedbally May 26, 2021
4b5a592
fix spaces in if
ahmedbally May 26, 2021
8a25aab
fix space in test function testResolveModelWithEncodedKeyWithCustomKey
ahmedbally May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix custom key routing
  • Loading branch information
@ahmedbally
ahmedbally committed May 25, 2021
commit dca430c1373d4bb8d5dd04018c4ef2e9454ad800
8 changes: 3 additions & 5 deletions src/Traits/OptimusEncodedRouteKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,11 @@ public function resolveRouteBinding($value, $field = null)
$value = (int) $value;
}

if (!is_int($value)) {
return null;
if (is_int($value) && is_null($field)){
$value = $this->getOptimus()->decode($value);
}

$id = $this->getOptimus()->decode($value);

return $this->where($this->getRouteKeyName(), '=', $id)->first();
return $this->where($field ?? $this->getRouteKeyName(),$value)->first();
antonkomarev marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down