Merge branch 'develop'

This commit is contained in:
snipe 2018-05-16 19:38:23 -07:00
commit 8eb96efa13

View file

@ -535,15 +535,13 @@ class UsersController extends Controller
* @since [v1.0] * @since [v1.0]
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
*/ */
public function postBulkSave() public function postBulkSave(Request $request)
{ {
$this->authorize('update', User::class); $this->authorize('update', User::class);
if ((!$request->has('ids')) || (count($request->input('ids')) == 0)) {
if ((!Input::has('ids')) || (count(Input::get('ids')) == 0)) {
return redirect()->back()->with('error', 'No users selected'); return redirect()->back()->with('error', 'No users selected');
} elseif ((!Input::has('status_id')) || (Input::get('status_id')=='')) { } elseif ((!$request->has('status_id')) || ($request->input('status_id')=='')) {
return redirect()->route('users.index')->with('error', 'No status selected'); return redirect()->route('users.index')->with('error', 'No status selected');
} else { } else {