fixed relationship conflict
This commit is contained in:
parent
81fd6be62f
commit
067f7e5635
@ -74,11 +74,11 @@ class Company extends Eloquent
|
|||||||
parent::boot();
|
parent::boot();
|
||||||
|
|
||||||
static::retrieved(function($model) {
|
static::retrieved(function($model) {
|
||||||
$model->setSettings();
|
$model->setCommonSettingsAsAttributes();
|
||||||
});
|
});
|
||||||
|
|
||||||
static::saving(function($model) {
|
static::saving(function($model) {
|
||||||
$model->unsetSettings();
|
$model->unsetCommonSettingsFromAttributes();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -267,7 +267,7 @@ class Company extends Eloquent
|
|||||||
return $this->hasMany('App\Models\Common\Widget');
|
return $this->hasMany('App\Models\Common\Widget');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setSettings()
|
public function setCommonSettingsAsAttributes()
|
||||||
{
|
{
|
||||||
$settings = $this->settings;
|
$settings = $this->settings;
|
||||||
|
|
||||||
@ -299,7 +299,7 @@ class Company extends Eloquent
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function unsetSettings()
|
public function unsetCommonSettingsFromAttributes()
|
||||||
{
|
{
|
||||||
$settings = $this->settings;
|
$settings = $this->settings;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user