mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-26 06:04:08 -08:00
323c3807fa
* Make delete routes work. We put a little form in the modal that spoofs the delete field. * Fix route on creating a user. * Fix redundant id parameter. * Port acceptance tests to new urls. * Initial work on migrating to model based policies instead of global gates. Will allow for much more detailed permissions bits in the future. * This needs to stay for the dashboard checks. * Add user states for permissions to build tests. * Build up unit tests for gates/permissions. Move accessories/consumables/assets to policies instead of in authserviceprovider * Migrate various locations to new syntax. Update test to be more specific * Fix functional tests. Add an artisan command for installing a settings setup on travis-ci * Try a different id... Need to come up with a better way of passing the id for tests that need an existing one. * Try to fix travis * Update urls to use routes and not hardcode old paths. Also fix some migration errors found along the way.: * Add a environment for travis functional tests. * Adjust config file to make travis use it. * Use redirect()->route instead of redirect()-to * Dump all failures in the output directory if travis fails. * Cleanups and minor fixes. * Adjust the supplier modelfactory to comply with new validation restrictions. * Some test fixes. * Locales can be longer than 5 characters according to faker... fex gez_ET. Increase lenght in mysql and add a validation * Update test database dump to latest migrations. * Extend Supplier phone/fax length. This catches issues found in testing with a phone number with a five digit extension. fex (356) 654-3024 x36632 Also move away from escaping all values put into eloquent. Eloquent already uses PDO parameter binding, and this was leading to names like Mr Ryan O'Malley turning into an html escaped version of that name when stored. All values should be escaped when using {{}}, we'll just have to be more cautious when we use {!!, but I think we already are? * Remove additional escaping here, like we did in suppliers controller. * No need to eager load all of these relationships when we can call the count on the querybuilder directly * Work on controller cleanup * Always start from scrach, catches more issues this way. * Update sql dump. Remove old code from permissions test. * Generate a deletable item on demand in the test, rather than relying on one existing. I think we should probably move to mock all the database stuff at some point.. * More travis related fixes * Break script into multiple functional lines * Update all controllers to use the new helper, also cleanup syntax and docblocks along the way.
215 lines
6.8 KiB
PHP
Executable file
215 lines
6.8 KiB
PHP
Executable file
<?php
|
|
namespace App\Http\Controllers;
|
|
|
|
use Config;
|
|
use Input;
|
|
use Lang;
|
|
use Redirect;
|
|
use App\Models\Setting;
|
|
use Validator;
|
|
use View;
|
|
use App\Models\Group;
|
|
use App\Helpers\Helper;
|
|
|
|
/**
|
|
* This controller handles all actions related to User Groups for
|
|
* the Snipe-IT Asset Management application.
|
|
*
|
|
* @version v1.0
|
|
*/
|
|
class GroupsController extends Controller
|
|
{
|
|
/**
|
|
* Returns a view that invokes the ajax tables which actually contains
|
|
* the content for the user group listing, which is generated in getDatatable.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net]
|
|
* @see GroupsController::getDatatable() method that generates the JSON response
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Contracts\View\View
|
|
*/
|
|
public function getIndex()
|
|
{
|
|
// Show the page
|
|
return View::make('groups/index', compact('groups'));
|
|
}
|
|
|
|
/**
|
|
* Returns a view that displays a form to create a new User Group.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net]
|
|
* @see GroupsController::postCreate()
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Contracts\View\View
|
|
*/
|
|
public function getCreate()
|
|
{
|
|
$group = new Group;
|
|
// Get all the available permissions
|
|
$permissions = config('permissions');
|
|
$groupPermissions = array();
|
|
$selectedPermissions = Input::old('permissions', $groupPermissions);
|
|
|
|
// Show the page
|
|
return View::make('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))->with('group', $group);
|
|
}
|
|
|
|
/**
|
|
* Validates and stores the new User Group data.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net]
|
|
* @see GroupsController::getCreate()
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
*/
|
|
public function postCreate()
|
|
{
|
|
// create a new group instance
|
|
$group = new Group();
|
|
$group->name = e(Input::get('name'));
|
|
$group->permissions = json_encode(Input::get('permission'));
|
|
|
|
if ($group->save()) {
|
|
return redirect()->to("admin/groups")->with('success', trans('admin/groups/message.success.create'));
|
|
}
|
|
return redirect()->back()->withInput()->withErrors($group->getErrors());
|
|
}
|
|
|
|
/**
|
|
* Returns a view that presents a form to edit a User Group.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net]
|
|
* @see GroupsController::postEdit()
|
|
* @param int $id
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Contracts\View\View
|
|
*/
|
|
public function getEdit($id = null)
|
|
{
|
|
$group = Group::find($id);
|
|
$permissions = config('permissions');
|
|
$groupPermissions = $group->decodePermissions();
|
|
$selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
|
|
return View::make('groups/edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
|
|
}
|
|
|
|
/**
|
|
* Validates and stores the updated User Group data.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net]
|
|
* @see GroupsController::getEdit()
|
|
* @param int $id
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
*/
|
|
public function postEdit($id = null)
|
|
{
|
|
$permissions = config('permissions');
|
|
if (!$group = Group::find($id)) {
|
|
return redirect()->route('groups')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
|
|
}
|
|
$group->name = e(Input::get('name'));
|
|
$group->permissions = json_encode(Input::get('permission'));
|
|
|
|
if (!config('app.lock_passwords')) {
|
|
if ($group->save()) {
|
|
return redirect()->to("admin/groups")->with('success', trans('admin/groups/message.success.update'));
|
|
}
|
|
return redirect()->back()->withInput()->withErrors($group->getErrors());
|
|
}
|
|
return redirect()->route('groups')->with('error', trans('general.feature_disabled'));
|
|
}
|
|
|
|
/**
|
|
* Validates and deletes the User Group.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net]
|
|
* @see GroupsController::getEdit()
|
|
* @param int $id
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
*/
|
|
public function getDelete($id = null)
|
|
{
|
|
if (!config('app.lock_passwords')) {
|
|
if (!$group = Group::find($id)) {
|
|
return redirect()->route('groups')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
|
|
}
|
|
$group->delete();
|
|
// Redirect to the group management page
|
|
return redirect()->route('groups')->with('success', trans('admin/groups/message.success.delete'));
|
|
}
|
|
return redirect()->route('groups')->with('error', trans('general.feature_disabled'));
|
|
}
|
|
|
|
|
|
/**
|
|
* Generates the JSON used to display the User Group listing.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v2.0]
|
|
* @return String JSON
|
|
*/
|
|
public function getDatatable()
|
|
{
|
|
|
|
$offset = request('offset', 0);
|
|
$limit = request('limit', 50);
|
|
|
|
if (Input::get('sort')=='name') {
|
|
$sort = 'first_name';
|
|
} else {
|
|
$sort = e(Input::get('sort'));
|
|
}
|
|
|
|
// Grab all the groups
|
|
$groups = Group::with('users')->orderBy('name', 'ASC');
|
|
|
|
if (Input::has('search')) {
|
|
$groups = $users->TextSearch(e(Input::get('search')));
|
|
}
|
|
|
|
$order = Input::get('order') === 'asc' ? 'asc' : 'desc';
|
|
|
|
$allowed_columns = [
|
|
'name','created_at'
|
|
];
|
|
|
|
$sort = in_array($sort, $allowed_columns) ? $sort : 'name';
|
|
$groups = $groups->orderBy($sort, $order);
|
|
|
|
$groupsCount = $groups->count();
|
|
$groups = $groups->skip($offset)->take($limit)->get();
|
|
$rows = array();
|
|
|
|
foreach ($groups as $group) {
|
|
$actions = '<nobr>';
|
|
$actions .= Helper::generateDatatableButton('edit', route('update/group', $group->id));
|
|
|
|
if (!config('app.lock_passwords')) {
|
|
$actions .= Helper::generateDatatableButton(
|
|
'delete',
|
|
route('delete/group', $group->id),
|
|
true, /*enabled*/
|
|
trans('admin/groups/message.delete.confirm'),
|
|
$group->name
|
|
);
|
|
} else {
|
|
$actions .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
|
|
}
|
|
|
|
$actions .= '</nobr>';
|
|
|
|
$rows[] = array(
|
|
'id' => $group->id,
|
|
'name' => $group->name,
|
|
'users' => $group->users->count(),
|
|
'created_at' => $group->created_at->format('Y-m-d'),
|
|
'actions' => ($actions) ? $actions : '',
|
|
);
|
|
}
|
|
$data = array('total'=>$groupsCount, 'rows'=>$rows);
|
|
return $data;
|
|
}
|
|
}
|