From ab0a8b3b6105c17e148ea8fb8a4acda313f7f80a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 14 Mar 2015 02:09:21 -0700
Subject: [PATCH] Added bulk edit back in (it looks like ass right now)

---
 app/config/version.php                     |  4 ++--
 app/controllers/admin/AssetsController.php |  9 +++++++++
 app/views/backend/hardware/index.blade.php | 13 +++++++------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 48d8495a08..e79fceb5b2 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-24',
-  'hash_version' => 'v1.2.6.1-24-ge23c0cb',
+  'app_version' => 'v1.2.6.1-33',
+  'hash_version' => 'v1.2.6.1-33-g2a0350b',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 7730545ed9..0c367fb1d1 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -911,6 +911,7 @@ class AssetsController extends AdminController
 			       
         $assets = $assets->orderBy('asset_tag', 'ASC')->get();
         
+        
         $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets) 
         	{ 
 	        	if ($assets->deleted_at=='') {
@@ -931,7 +932,15 @@ class AssetsController extends AdminController
 				}
 	        });
         
+        
+        
         return Datatable::collection($assets)
+        ->addColumn('',function($assets)
+            {
+                                
+                    return '<input type="checkbox" name="edit_asset['.$assets->id.']" class="one_required">';
+                
+            })
         ->addColumn('name',function($assets)
 	        {
 		        return link_to('hardware/'.$assets->id.'/view', $assets->name);
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index fd9c8a7175..86d2164469 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -45,7 +45,7 @@
     </div>
 </div>
 
-<div class="row form-wrapper">
+<div class="row">
 
 
 
@@ -57,7 +57,7 @@
 
 
 {{ Datatable::table()
-    ->addColumn(Lang::get('admin/hardware/form.name'), 
+    ->addColumn('',Lang::get('admin/hardware/form.name'), 
     	Lang::get('admin/hardware/table.asset_tag'), 
     	Lang::get('admin/hardware/table.serial'),
 		Lang::get('admin/hardware/form.model'),
@@ -99,20 +99,21 @@
             )
         )
     ->render() }}
+    <button class="btn btn-default" id="bulkEdit" disabled>Bulk Edit</button>
 
  {{ Form::close() }}
 
 </div>
-<script>
-	
 
 
+<script>
+
 	$(function() {
 
-	    $('input.one_required').change(function() {
+	    $('body').on('change','input.one_required',function() {
 
 	        var check_checked = $('input.one_required:checked').length;
-	        console.warn(check_checked);
+	        //console.log(check_checked);
 	        if (check_checked > 0) {
 	            $('#bulkEdit').removeAttr('disabled');
 	        }