Fixing pivot for users

snipe · Nov 29, 2013 · f0f07b5 · f0f07b5
1 parent e23f1f1
commit f0f07b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/models/User.php b/app/models/User.php
@@ -44,7 +44,7 @@ public function assets()
 
 	public function licenses()
 	{
-		return $this->belongsToMany('License', 'license_seats', 'assigned_to', 'license_id')->withTrashed();
+		return $this->belongsToMany('License', 'license_seats', 'assigned_to', 'license_id')->withTrashed()->withPivot('id');
 	}
 
 

diff --git a/app/validators.php b/app/validators.php
@@ -2,5 +2,5 @@
 
 Validator::extend('alpha_space', function($attribute,$value,$parameters)
 {
-	return preg_match("/^[-+:?()_,!. a-zA-Z0-9]+$/",$value);
+	return preg_match("/^[-+:?'()_,!. a-zA-Z0-9]+$/",$value);
 });
diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php
@@ -92,8 +92,8 @@
 										</td>
 										<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
 										<td><a href="{{ route('view/license', $license->id) }}">{{ $license->name }}</a></td>
-
-										<td> <a href="{{ route('checkin/license', $license->id) }}" class="btn-flat info">Checkin</a></td>
+										<td> <a href="{{ route('checkin/license', $license->pivot->id) }}" class="btn-flat info">Checkin</a>
+										</td>
 									</tr>
 									@endforeach
                                 </tbody>
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ public function assets() @@
     	public function licenses()
     	{
-    		return $this->belongsToMany('License', 'license_seats', 'assigned_to', 'license_id')->withTrashed();
+    		return $this->belongsToMany('License', 'license_seats', 'assigned_to', 'license_id')->withTrashed()->withPivot('id');
     	}
@@ Expand Down @@