Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"

This reverts commit 41b711740a, reversing
changes made to 55309bfaef.

It also un-reverts reversions that were done inadvertently.
This commit is contained in:
Brady Wetherington
2015-07-20 17:12:28 -07:00
parent 775a38880e
commit c683c1c57e
25 changed files with 772 additions and 2032 deletions
+15
View File
@@ -424,6 +424,21 @@ class UsersController extends AdminController
}
}
public function postBulkEdit() {
if (!Input::has('edit_user')) {
return Redirect::back()->with('error', 'No users selected');
} else {
$user_raw_array = Input::get('edit_user');
foreach ($user_raw_array as $user_id => $value) {
$user_ids[] = $user_id;
}
}
}
/**
* Restore a deleted user.
*