Fix eager loading for user throttle

snipe · Mar 17, 2015 · c00086c · c00086c
1 parent c2c0196
commit c00086c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/app/config/version.php b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-66',
-  'hash_version' => 'v1.2.6.1-66-g0ffb5df',
+  'app_version' => 'v1.2.6.1-67',
+  'hash_version' => 'v1.2.6.1-67-g3da6522',
 );
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
@@ -881,7 +881,7 @@ public function postBulkSave($assets = null)
     public function getDatatable($status = null)
     {
 
-       $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware();
+       $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog','model','model.category','sentryThrottle')->Hardware();
 
 
 			switch ($status) {

diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
@@ -678,7 +678,7 @@ public function postImport()
 	public function getDatatable($status = null)
     {
 
-	$users = User::with('assets','licenses','manager');
+	$users = User::with('assets','licenses','manager','sentryThrottle');
 
 	switch ($status) {
 		case 'deleted':

diff --git a/app/models/Throttle.php b/app/models/Throttle.php
@@ -0,0 +1,12 @@
+<?php
+class Throttle extends Elegant
+{
+
+	protected $table = 'throttle';
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id');
+    }
+
+
+}
diff --git a/app/models/User.php b/app/models/User.php
@@ -77,18 +77,23 @@ public function manager()
     {
         return $this->belongsTo('User','manager_id')->withTrashed();
     }
-
+
+
     public function accountStatus()
     {
-        $throttle = Sentry::findThrottlerByUserId($this->id);
-
-        if ($throttle->isBanned()) {
-            return 'banned';
-        } elseif ($throttle->isSuspended()) {
-            return 'suspended';
-        } else {
-            return '';
-        }
+	    if ($this->sentryThrottle->suspended==1) {
+		 	return 'suspended';	
+		} elseif ($this->sentryThrottle->banned==1) {
+		 	return 'banned';	
+	 	} else {		 	
+		 	return false;
+	 	}
+
+
+    }
+
+    public function sentryThrottle() {	    
+	    return $this->hasOne('Throttle'); 
     }
 
     public function scopeGetDeleted($query)