Skip to content

Add config option for model owner key #276

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
wizston wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add config option for model owner key #276

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8c5a1d
Add config option for model owner key
wizston May 12, 2017
8767a15
Change method of getting owner primary key to laravel native helper f…
wizston May 14, 2017
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: 9 additions & 2 deletions src/Notifynder/Models/Notification.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class Notification extends Model
'extra' => 'array',
];

protected $notifiedModelInstance;
/**
* Notification constructor.
*
Expand All @@ -72,6 +73,10 @@ public function __construct($attributes = [])
}

parent::__construct($attributes);


$notifiedModel= notifynder_config()->getNotifiedModel();
$this->notifiedModelInstance = new $notifiedModel;
}

/**
Expand All @@ -87,11 +92,13 @@ public function category()
*/
public function from()
{


if (notifynder_config()->isPolymorphic()) {
return $this->morphTo('from');
}

return $this->belongsTo(notifynder_config()->getNotifiedModel(), 'from_id');
return $this->belongsTo(notifynder_config()->getNotifiedModel(), 'from_id', $this->notifiedModelInstance->getKeyName());
}

/**
Expand All @@ -103,7 +110,7 @@ public function to()
return $this->morphTo('to');
}

return $this->belongsTo(notifynder_config()->getNotifiedModel(), 'to_id');
return $this->belongsTo(notifynder_config()->getNotifiedModel(), 'to_id', $this->notifiedModelInstance->getKeyName());
}

/**
Expand Down