user model registration fixes 4 => 5

LifeboyTech · Aug 30, 2016 · e32e8e5 · e32e8e5
1 parent 091b14b
commit e32e8e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Lifeboy/Station/Models/Panel.php b/src/Lifeboy/Station/Models/Panel.php
@@ -719,7 +719,7 @@ private function attach_joins($model, $user_scope, $for_user = FALSE){
 
             } else { // new user is forced into a group
 
-                $group_id = Group::where('name', '=', $starting_group_name)->pluck('id');
+                $group_id = Group::where('name', '=', $starting_group_name)->first()->id;
             }
 
             $model->groups()->attach($group_id);

diff --git a/src/Lifeboy/Station/Models/User.php b/src/Lifeboy/Station/Models/User.php
@@ -12,6 +12,6 @@ public function __construct()
 
     public function groups()
     {
-        return $this->belongsToMany('Lifeboy\Station\Models\Group');
+        return $this->belongsToMany('Lifeboy\Station\Models\Group', 'group_user', 'user_id', 'group_id');
     }
 }