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

Jump to bottom

Clear menu-cache when deleting items #4083

Merged
merged 5 commits into from May 1, 2019
Merged

Clear menu-cache when deleting items #4083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
917fa0a
Clear menu-cache when deleting items
emptynick Apr 13, 2019
e416c58
Use observer
emptynick Apr 23, 2019
17fd9d9
Use inline events
emptynick Apr 27, 2019
414feea
Update VoyagerServiceProvider.php
emptynick Apr 27, 2019
33d8bcf
Merge branch '1.2' into menu-cache
fletch3555 May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/Models/Menu.php
View file
Open in desktop
Expand Up @@ -16,6 +16,19 @@ class Menu extends Model

protected $guarded = [];

public static function boot()
{
parent::boot();

static::saved(function ($model) {
$model->removeMenuFromCache();
});

static::deleted(function ($model) {
$model->removeMenuFromCache();
});
}

public function items()
{
return $this->hasMany(Voyager::modelClass('MenuItem'));
Expand Down Expand Up @@ -86,12 +99,9 @@ public static function display($menuName, $type = null, array $options = [])
);
}

public function save(array $options = [])
public function removeMenuFromCache()
{
//Remove from cache
\Cache::forget('voyager_menu_'.$this->name);

parent::save();
}

private static function processItems($items)
Expand Down
25 changes: 17 additions & 8 deletions src/Models/MenuItem.php
View file
Open in desktop
Expand Up @@ -21,6 +21,23 @@ class MenuItem extends Model

protected $translatable = ['title'];

public static function boot()
{
parent::boot();

static::created(function ($model) {
$model->menu->removeMenuFromCache();
});

static::saved(function ($model) {
$model->menu->removeMenuFromCache();
});

static::deleted(function ($model) {
$model->menu->removeMenuFromCache();
});
}

public function children()
{
return $this->hasMany(Voyager::modelClass('MenuItem'), 'parent_id')
Expand Down Expand Up @@ -115,12 +132,4 @@ public function highestOrderMenuItem($parent = null)

return $order;
}

public function save(array $options = [])
{
//Remove from cache
\Cache::forget('voyager_menu_'.$this->menu->name);

parent::save();
}
}