mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 21:24:13 -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.
141 lines
4.2 KiB
PHP
141 lines
4.2 KiB
PHP
<?php
|
|
namespace App\Http\Controllers;
|
|
|
|
use App\Models\Company;
|
|
use Input;
|
|
use Lang;
|
|
use Redirect;
|
|
use View;
|
|
use Illuminate\Http\Request;
|
|
|
|
/**
|
|
* This controller handles all actions related to Companies for
|
|
* the Snipe-IT Asset Management application.
|
|
*
|
|
* @version v1.0
|
|
*/
|
|
|
|
final class CompaniesController extends Controller
|
|
{
|
|
|
|
/**
|
|
* Returns view to display listing of companies.
|
|
*
|
|
* @author [Abdullah Alansari] [<ahimta@gmail.com>]
|
|
* @since [v1.8]
|
|
* @return \Illuminate\Contracts\View\View
|
|
*/
|
|
public function index()
|
|
{
|
|
return View::make('companies/index')->with('companies', Company::all());
|
|
}
|
|
|
|
/**
|
|
* Returns view to create a new company.
|
|
*
|
|
* @author [Abdullah Alansari] [<ahimta@gmail.com>]
|
|
* @since [v1.8]
|
|
* @return \Illuminate\Contracts\View\View
|
|
*/
|
|
public function create()
|
|
{
|
|
return View::make('companies/edit')->with('item', new Company);
|
|
}
|
|
|
|
/**
|
|
* Save data from new company form.
|
|
*
|
|
* @author [Abdullah Alansari] [<ahimta@gmail.com>]
|
|
* @since [v1.8]
|
|
* @param Request $request
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
*/
|
|
public function store(Request $request)
|
|
{
|
|
$company = new Company;
|
|
$company->name = $request->input('name');
|
|
|
|
if ($company->save()) {
|
|
return redirect()->route('companies.index')
|
|
->with('success', trans('admin/companies/message.create.success'));
|
|
}
|
|
return redirect()->back()->withInput()->withErrors($company->getErrors());
|
|
}
|
|
|
|
|
|
/**
|
|
* Return form to edit existing company.
|
|
*
|
|
* @author [Abdullah Alansari] [<ahimta@gmail.com>]
|
|
* @since [v1.8]
|
|
* @param int $companyId
|
|
* @return \Illuminate\Contracts\View\View
|
|
*/
|
|
public function edit($companyId)
|
|
{
|
|
if (is_null($item = Company::find($companyId))) {
|
|
return redirect()->route('companies.index')
|
|
->with('error', trans('admin/companies/message.does_not_exist'));
|
|
}
|
|
return View::make('companies/edit')->with('item', $item);
|
|
}
|
|
|
|
/**
|
|
* Save data from edit company form.
|
|
*
|
|
* @author [Abdullah Alansari] [<ahimta@gmail.com>]
|
|
* @since [v1.8]
|
|
* @param Request $request
|
|
* @param int $companyId
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
*/
|
|
public function update(Request $request, $companyId)
|
|
{
|
|
if (is_null($company = Company::find($companyId))) {
|
|
return redirect()->route('companies.index')->with('error', trans('admin/companies/message.does_not_exist'));
|
|
}
|
|
|
|
$company->name = $request->input('name');
|
|
|
|
if ($company->save()) {
|
|
return redirect()->route('companies.index')
|
|
->with('success', trans('admin/companies/message.update.success'));
|
|
}
|
|
return redirect()->route('companies.edit', ['company' => $companyId])
|
|
->with('error', trans('admin/companies/message.update.error'));
|
|
}
|
|
|
|
/**
|
|
* Delete company
|
|
*
|
|
* @author [Abdullah Alansari] [<ahimta@gmail.com>]
|
|
* @since [v1.8]
|
|
* @param int $companyId
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
*/
|
|
public function destroy($companyId)
|
|
{
|
|
if (is_null($company = Company::find($companyId))) {
|
|
return redirect()->route('companies.index')
|
|
->with('error', trans('admin/companies/message.not_found'));
|
|
} else {
|
|
try {
|
|
$company->delete();
|
|
return redirect()->route('companies.index')
|
|
->with('success', trans('admin/companies/message.delete.success'));
|
|
} catch (\Illuminate\Database\QueryException $exception) {
|
|
/*
|
|
* NOTE: This happens when there's a foreign key constraint violation
|
|
* For example when rows in other tables are referencing this company
|
|
*/
|
|
if ($exception->getCode() == 23000) {
|
|
return redirect()->route('companies.index')
|
|
->with('error', trans('admin/companies/message.assoc_users'));
|
|
} else {
|
|
throw $exception;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|