Asset counter for #759 (needs more work)

snipe · May 4, 2015 · c487bee · c487bee
1 parent f463cd6
commit c487bee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/app/config/version.php b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.7-2',
-  'hash_version' => 'v1.2.7-2-gc8870dd',
+  'app_version' => 'v1.2.7-3',
+  'hash_version' => 'v1.2.7-3-g5e7a4e8',
 );
diff --git a/app/controllers/admin/LocationsController.php b/app/controllers/admin/LocationsController.php
@@ -23,7 +23,7 @@ class LocationsController extends AdminController
     public function getIndex()
     {
         // Grab all the locations
-        $locations = Location::orderBy('created_at', 'DESC')->with('parent')->get();
+        $locations = Location::orderBy('created_at', 'DESC')->with('parent','assets')->get();
 
         // Show the page
         return View::make('backend/locations/index', compact('locations'));
@@ -172,7 +172,7 @@ public function getDelete($locationId)
         }
 
 
-        if ($location->has_users() > 0) {
+        if ($location->has_users->count() > 0) {
             return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users'));
         } elseif ($location->childLocations->count() > 0) {
             return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users'));

diff --git a/app/models/Location.php b/app/models/Location.php
@@ -16,7 +16,11 @@ class Location extends Elegant
         );
 
     public function has_users() {
-        return $this->hasMany('User', 'location_id')->count();
+        return $this->hasMany('User', 'location_id');
+    }
+
+    public function assets() {
+        return $this->hasMany('Actionlog','location_id');
     }
 
     public function parent() {

diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
@@ -23,6 +23,7 @@
         <tr role="row">
             <th class="col-md-2">@lang('admin/locations/table.name')</th>
             <th class="col-md-2">@lang('admin/locations/table.parent')</th>
+            <th class="col-md-3">@lang('admin/locations/table.assets')</th>
             <th class="col-md-3">@lang('admin/locations/table.address')</th>
             <th class="col-md-2">@lang('admin/locations/table.city'),
              @lang('admin/locations/table.state')
@@ -33,11 +34,13 @@
     <tbody>
         @foreach ($locations as $location)
         <tr>
-            <td>{{{ $location->name }}}</td><td>
+            <td>{{{ $location->name }}}</td>
+            <td>
               @if ($location->parent)
                 {{{ $location->parent->name }}}
               @endif
             </td>
+            <td>{{{ $location->assets->count() }}}</td>
             <td>{{{ $location->address }}}
             	@if($location->address2 != '')
             		, {{{ $location->address2 }}}