mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-26 14:09:43 -08:00
79367642b1
* Added AWS url to example env * Upgrader - added check for new storage path and attempt to move * Ignore symlink * Updated paths for models * Moved copy methods * Added AWS_URL support For some reasin, Flysystem was generating the wrong AWS url (with a region included) * Switch to Flysystem for image uploads * Nicer display of image preview * Updated image preview on edit blades to use Flysystem * Twiddled some more paths * Working filesystems config * Updated Asset Models and Departments to use Flysystem * Janky workaround for differing S3/local urls/paths * Try to smartly use S3 as public disk if S3 is configured * Use public disk Storage options for public files * Additional transformer edits for Flysystem * Removed debugging * Added missing use Storage directive * Updated seeders to use Flysystem * Default logo * Set a default width We can potentially override this in settings later * Use Flysystem for logo upload * Update downloadFile to use Flysystem * Updated AssetFilesController to use Flysystem * Updated acceptance signatures to use Flysystem * Updated signature view to use Flysystem This isn’t working 100% yet * Use Flysystem facade for displaying asset image * Set assets path Should clean all these up when we’re done here * Added Rackspace support for Flysystem * Added Flysystem migrator console command * Added use Storage directive for categories * Added user avatars to Flysystem * Added profile avatar to Flysystem * Added the option to delete local files with the migrator * Added a check to prevent people from trying to move from local to local * Fixed the selectlists for Flysystem * Fixed the getImageUrl method to reflect Flysystem * Fixed AWS copy process * Fixed models path * More selectlist updates for Flysystem * Updated example .envs with updated env variable names * *sigh* * Updated non-asset getImageUrl() methods to use Flysystem * Removed S3 hardcoding * Use Flysystem in email headers * Fixed typo * Removed camera support from asset file upload We’ll find a way to add this in later (and add that support to all of the other image uploads as well) * Fixed path for categories * WIP - Switched to standard handleImages for asset upload. This is currently broken as I refact the handleImages method. Because the assets store/create methods use their own Form Request, the handleImages method doesn’t exist in that Form Request so it wil error now. * Fixed css URL error * Updated Debugbar to latest version (#6265) v3.2 adds support for Laravel 5.7 * Fixed: Missing CSS file in basic.blade.php (#6264) * Fixed missing CSS file in basic.blade.php * Added * Changed stylesheet import for authorize.blade.php * Updated composer lock * Added AWS_BUCKET_ROOT as env variable * Use nicer image preview for logo upload * Removed AssetRequest form request * Removed asset form request, moved custom field validation into model * Added additional help text for logo upload * Increased the size of the image resize - should make this a setting tho * Few more formatting tweaks to logo section of branding blade preview * Use Flysystem for asset/license file uploads * Use Flysystem for removing images from models that have been deleted * Enable backups to use Flysystem This only handles part of the problem. This just makes it so we can ship files to S3 if we want, but does not account for how we backup files that are hosted on S3 * Use Flysystem to download license files * Updated audits to use Flysystem
235 lines
8.4 KiB
PHP
Executable file
235 lines
8.4 KiB
PHP
Executable file
<?php
|
|
namespace App\Http\Controllers;
|
|
|
|
use App\Http\Requests\ImageUploadRequest;
|
|
use App\Models\Manufacturer;
|
|
use Illuminate\Support\Facades\Auth;
|
|
use Redirect;
|
|
use Illuminate\Http\Request;
|
|
use Image;
|
|
use Illuminate\Support\Facades\Storage;
|
|
|
|
/**
|
|
* This controller handles all actions related to Manufacturers for
|
|
* the Snipe-IT Asset Management application.
|
|
*
|
|
* @version v1.0
|
|
*/
|
|
class ManufacturersController extends Controller
|
|
{
|
|
/**
|
|
* Returns a view that invokes the ajax tables which actually contains
|
|
* the content for the manufacturers listing, which is generated in getDatatable.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see Api\ManufacturersController::index() method that generates the JSON response
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Contracts\View\View
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function index()
|
|
{
|
|
$this->authorize('index', Manufacturer::class);
|
|
return view('manufacturers/index', compact('manufacturers'));
|
|
}
|
|
|
|
|
|
/**
|
|
* Returns a view that displays a form to create a new manufacturer.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see ManufacturersController::store()
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Contracts\View\View
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function create()
|
|
{
|
|
$this->authorize('create', Manufacturer::class);
|
|
return view('manufacturers/edit')->with('item', new Manufacturer);
|
|
}
|
|
|
|
|
|
/**
|
|
* Validates and stores the data for a new manufacturer.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see ManufacturersController::create()
|
|
* @since [v1.0]
|
|
* @param ImageUploadRequest $request
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function store(ImageUploadRequest $request)
|
|
{
|
|
|
|
$this->authorize('create', Manufacturer::class);
|
|
$manufacturer = new Manufacturer;
|
|
$manufacturer->name = $request->input('name');
|
|
$manufacturer->user_id = Auth::id();
|
|
$manufacturer->url = $request->input('url');
|
|
$manufacturer->support_url = $request->input('support_url');
|
|
$manufacturer->support_phone = $request->input('support_phone');
|
|
$manufacturer->support_email = $request->input('support_email');
|
|
|
|
|
|
$manufacturer = $request->handleImages($manufacturer,'manufacturers');
|
|
|
|
|
|
|
|
if ($manufacturer->save()) {
|
|
return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.create.success'));
|
|
}
|
|
return redirect()->back()->withInput()->withErrors($manufacturer->getErrors());
|
|
}
|
|
|
|
/**
|
|
* Returns a view that displays a form to edit a manufacturer.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see ManufacturersController::update()
|
|
* @param int $manufacturerId
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Contracts\View\View
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function edit($manufacturerId = null)
|
|
{
|
|
$this->authorize('edit', Manufacturer::class);
|
|
// Check if the manufacturer exists
|
|
if (is_null($item = Manufacturer::find($manufacturerId))) {
|
|
return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
|
|
}
|
|
// Show the page
|
|
return view('manufacturers/edit', compact('item'));
|
|
}
|
|
|
|
|
|
/**
|
|
* Validates and stores the updated manufacturer data.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see ManufacturersController::getEdit()
|
|
* @param Request $request
|
|
* @param int $manufacturerId
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
* @since [v1.0]
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function update(ImageUploadRequest $request, $manufacturerId = null)
|
|
{
|
|
$this->authorize('edit', Manufacturer::class);
|
|
// Check if the manufacturer exists
|
|
if (is_null($manufacturer = Manufacturer::find($manufacturerId))) {
|
|
// Redirect to the manufacturer page
|
|
return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
|
|
}
|
|
|
|
// Save the data
|
|
$manufacturer->name = $request->input('name');
|
|
$manufacturer->url = $request->input('url');
|
|
$manufacturer->support_url = $request->input('support_url');
|
|
$manufacturer->support_phone = $request->input('support_phone');
|
|
$manufacturer->support_email = $request->input('support_email');
|
|
|
|
$manufacturer = $request->handleImages($manufacturer);
|
|
|
|
|
|
if ($manufacturer->save()) {
|
|
return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.update.success'));
|
|
}
|
|
return redirect()->back()->withInput()->withErrors($manufacturer->getErrors());
|
|
}
|
|
|
|
/**
|
|
* Deletes a manufacturer.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @param int $manufacturerId
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function destroy($manufacturerId)
|
|
{
|
|
$this->authorize('delete', Manufacturer::class);
|
|
if (is_null($manufacturer = Manufacturer::withCount('models as models_count')->find($manufacturerId))) {
|
|
return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.not_found'));
|
|
}
|
|
|
|
if ($manufacturer->models_count > 0) {
|
|
return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.assoc_users'));
|
|
}
|
|
|
|
if ($manufacturer->image) {
|
|
try {
|
|
Storage::disk('public')->delete('manufacturers/'.$manufacturer->image);
|
|
} catch (\Exception $e) {
|
|
\Log::error($e);
|
|
}
|
|
}
|
|
|
|
|
|
// Delete the manufacturer
|
|
$manufacturer->delete();
|
|
// Redirect to the manufacturers management page
|
|
return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.success'));
|
|
}
|
|
|
|
/**
|
|
* Returns a view that invokes the ajax tables which actually contains
|
|
* the content for the manufacturers detail listing, which is generated via API.
|
|
* This data contains a listing of all assets that belong to that manufacturer.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @param int $manufacturerId
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Contracts\View\View
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function show($manufacturerId = null)
|
|
{
|
|
$this->authorize('view', Manufacturer::class);
|
|
$manufacturer = Manufacturer::find($manufacturerId);
|
|
|
|
if (isset($manufacturer->id)) {
|
|
return view('manufacturers/view', compact('manufacturer'));
|
|
}
|
|
|
|
$error = trans('admin/manufacturers/message.does_not_exist');
|
|
// Redirect to the user management page
|
|
return redirect()->route('manufacturers.index')->with('error', $error);
|
|
}
|
|
|
|
/**
|
|
* Restore a given Manufacturer (mark as un-deleted)
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.1.15]
|
|
* @param int $manufacturers_id
|
|
* @return Redirect
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function restore($manufacturers_id)
|
|
{
|
|
$this->authorize('create', Manufacturer::class);
|
|
$manufacturer = Manufacturer::onlyTrashed()->where('id',$manufacturers_id)->first();
|
|
|
|
if ($manufacturer) {
|
|
|
|
// Not sure why this is necessary - it shouldn't fail validation here, but it fails without this, so....
|
|
$manufacturer->setValidating(false);
|
|
if ($manufacturer->restore()) {
|
|
return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.restore.success'));
|
|
}
|
|
return redirect()->back()->with('error', 'Could not restore.');
|
|
}
|
|
return redirect()->back()->with('error', trans('admin/manufacturers/message.does_not_exist'));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|