Skip to content

Fix error when model has array cast for "attributes" attribute. #110

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

Open
VGirol wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix error when model has array cast for "attributes" attribute. #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fc96f0
Fix method definition
VGirol Dec 23, 2022
57232b6
Fix error when model has array cast for "attributes" attribute.
VGirol Jan 28, 2023
d2000cc
Merge branch 'whitecube:master' into patch-cast
VGirol Feb 20, 2025
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
11 changes: 5 additions & 6 deletions src/Pages/Template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

namespace Whitecube\NovaPage\Pages;

use App;
use Closure;
use ArrayAccess;
use Carbon\Carbon;
use BadMethodCallException;
use Whitecube\NovaPage\Sources\SourceInterface;
use Whitecube\NovaPage\Exceptions\ValueNotFoundException;
use Whitecube\NovaPage\Exceptions\TemplateContentNotFoundException;
use Carbon\Carbon;
use Closure;
use Illuminate\Database\Eloquent\Concerns\HasAttributes;
use Laravel\Nova\Http\Requests\NovaRequest;
use Illuminate\Database\Eloquent\Model;
use Whitecube\NovaPage\Exceptions\TemplateContentNotFoundException;
use Whitecube\NovaPage\Exceptions\ValueNotFoundException;
use Whitecube\NovaPage\Sources\SourceInterface;

abstract class Template implements ArrayAccess
{
Expand Down
4 changes: 2 additions & 2 deletions src/Sources/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace Whitecube\NovaPage\Sources;

use \App;
use Illuminate\Support\Facades\DB;
use Carbon\Carbon;
use Illuminate\Support\Facades\DB;
use Whitecube\NovaPage\Pages\Template;

class Database implements SourceInterface {
Expand Down Expand Up @@ -67,7 +67,7 @@ public function fetch(Template $template)

$attributes = $this->getParsedAttributes(
$template,
$model->attributes ? json_decode($model->attributes, true) : []
$model->attributes ? (is_array($model->attributes) ? $model->attributes : json_decode($model->attributes, true)) : []
);

return [
Expand Down