Merge pull request #113 from ivan-cc/master

jeremykenedy · web-flow · commit 1861eeb1e905 · 2020-03-03T11:05:17.000-08:00
Fix pivot table name (`role_user`).
diff --git a/src/Traits/HasRoleAndPermission.php b/src/Traits/HasRoleAndPermission.php
@@ -34,7 +34,7 @@ trait HasRoleAndPermission
      */
     public function roles()
     {
-        return $this->belongsToMany(config('roles.models.role'))->withTimestamps();
+        return $this->belongsToMany(config('roles.models.role'), config('roles.roleUserTable'))->withTimestamps();
     }
 
     /**
diff --git a/src/Traits/RoleHasRelations.php b/src/Traits/RoleHasRelations.php
@@ -24,7 +24,7 @@ public function permissions()
      */
     public function users()
     {
-        return $this->belongsToMany(config('roles.models.defaultUser'))->withTimestamps();
+        return $this->belongsToMany(config('roles.models.defaultUser'), config('roles.roleUserTable'))->withTimestamps();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ trait HasRoleAndPermission`
`34`	`34`	`*/`
`35`	`35`	`public function roles()`
`36`	`36`	`{`
`37`		`- return $this->belongsToMany(config('roles.models.role'))->withTimestamps();`
	`37`	`+ return $this->belongsToMany(config('roles.models.role'), config('roles.roleUserTable'))->withTimestamps();`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function permissions()`
`24`	`24`	`*/`
`25`	`25`	`public function users()`
`26`	`26`	`{`
`27`		`- return $this->belongsToMany(config('roles.models.defaultUser'))->withTimestamps();`
	`27`	`+ return $this->belongsToMany(config('roles.models.defaultUser'), config('roles.roleUserTable'))->withTimestamps();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`