mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 15:44:11 -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
230 lines
9 KiB
PHP
Executable file
230 lines
9 KiB
PHP
Executable file
<?php
|
|
namespace App\Http\Controllers;
|
|
|
|
use App\Helpers\Helper;
|
|
use App\Models\Category as Category;
|
|
use App\Models\Company;
|
|
use App\Models\CustomField;
|
|
use App\Models\Setting;
|
|
use Auth;
|
|
use DB;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Support\Facades\Gate;
|
|
use Input;
|
|
use Lang;
|
|
use Redirect;
|
|
use Str;
|
|
use View;
|
|
use Image;
|
|
use App\Http\Requests\ImageUploadRequest;
|
|
use Illuminate\Support\Facades\Storage;
|
|
|
|
/**
|
|
* This class controls all actions related to Categories for
|
|
* the Snipe-IT Asset Management application.
|
|
*
|
|
* @version v1.0
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
*/
|
|
class CategoriesController extends Controller
|
|
{
|
|
|
|
/**
|
|
* Returns a view that invokes the ajax tables which actually contains
|
|
* the content for the categories listing, which is generated in getDatatable.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see CategoriesController::getDatatable() method that generates the JSON response
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Contracts\View\View
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function index()
|
|
{
|
|
// Show the page
|
|
$this->authorize('view', Category::class);
|
|
return view('categories/index');
|
|
}
|
|
|
|
|
|
/**
|
|
* Returns a form view to create a new category.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see CategoriesController::store() method that stores the data
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Contracts\View\View
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function create()
|
|
{
|
|
// Show the page
|
|
$this->authorize('create', Category::class);
|
|
return view('categories/edit')->with('item', new Category)
|
|
->with('category_types', Helper::categoryTypeList());
|
|
}
|
|
|
|
|
|
/**
|
|
* Validates and stores the new category data.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see CategoriesController::create() method that makes the form.
|
|
* @since [v1.0]
|
|
* @param ImageUploadRequest $request
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function store(ImageUploadRequest $request)
|
|
{
|
|
$this->authorize('create', Category::class);
|
|
$category = new Category();
|
|
$category->name = $request->input('name');
|
|
$category->category_type = $request->input('category_type');
|
|
$category->eula_text = $request->input('eula_text');
|
|
$category->use_default_eula = $request->input('use_default_eula', '0');
|
|
$category->require_acceptance = $request->input('require_acceptance', '0');
|
|
$category->checkin_email = $request->input('checkin_email', '0');
|
|
$category->user_id = Auth::id();
|
|
|
|
$category = $request->handleImages($category);
|
|
|
|
if ($category->save()) {
|
|
return redirect()->route('categories.index')->with('success', trans('admin/categories/message.create.success'));
|
|
}
|
|
|
|
return redirect()->back()->withInput()->withErrors($category->getErrors());
|
|
}
|
|
|
|
/**
|
|
* Returns a view that makes a form to update a category.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see CategoriesController::postEdit() method saves the data
|
|
* @param int $categoryId
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Contracts\View\View
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function edit($categoryId = null)
|
|
{
|
|
$this->authorize('edit', Category::class);
|
|
if (is_null($item = Category::find($categoryId))) {
|
|
return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
|
|
}
|
|
return view('categories/edit', compact('item'))
|
|
->with('category_types', Helper::categoryTypeList());
|
|
}
|
|
|
|
|
|
/**
|
|
* Validates and stores the updated category data.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see CategoriesController::getEdit() method that makes the form.
|
|
* @param ImageUploadRequest $request
|
|
* @param int $categoryId
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
* @since [v1.0]
|
|
*/
|
|
public function update(ImageUploadRequest $request, $categoryId = null)
|
|
{
|
|
$this->authorize('edit', Category::class);
|
|
if (is_null($category = Category::find($categoryId))) {
|
|
// Redirect to the categories management page
|
|
return redirect()->to('admin/categories')->with('error', trans('admin/categories/message.does_not_exist'));
|
|
}
|
|
|
|
// Update the category data
|
|
$category->name = $request->input('name');
|
|
// If the item count is > 0, we disable the category type in the edit. Disabled items
|
|
// don't POST, so if the category_type is blank we just set it to the default.
|
|
$category->category_type = $request->input('category_type', $category->category_type);
|
|
$category->eula_text = $request->input('eula_text');
|
|
$category->use_default_eula = $request->input('use_default_eula', '0');
|
|
$category->require_acceptance = $request->input('require_acceptance', '0');
|
|
$category->checkin_email = $request->input('checkin_email', '0');
|
|
|
|
$category = $request->handleImages($category);
|
|
|
|
if ($category->save()) {
|
|
// Redirect to the new category page
|
|
return redirect()->route('categories.index')->with('success', trans('admin/categories/message.update.success'));
|
|
}
|
|
// The given data did not pass validation
|
|
return redirect()->back()->withInput()->withErrors($category->getErrors());
|
|
}
|
|
|
|
/**
|
|
* Validates and marks a category as deleted.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v1.0]
|
|
* @param int $categoryId
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function destroy($categoryId)
|
|
{
|
|
$this->authorize('delete', Category::class);
|
|
// Check if the category exists
|
|
if (is_null($category = Category::withCount('models as models_count', 'accessories as accessories_count','consumables as consumables_count','components as components_count')->findOrFail($categoryId))) {
|
|
return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
|
|
}
|
|
|
|
if ($category->models_count > 0) {
|
|
return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'model']));
|
|
} elseif ($category->accessories_count > 0) {
|
|
return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'accessory']));
|
|
} elseif ($category->consumables_count > 0) {
|
|
return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'consumable']));
|
|
} elseif ($category->components_count > 0) {
|
|
return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'component']));
|
|
}
|
|
|
|
Storage::disk('public')->delete('categories'.'/'.$category->image);
|
|
$category->delete();
|
|
// Redirect to the locations management page
|
|
return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.success'));
|
|
}
|
|
|
|
|
|
/**
|
|
* Returns a view that invokes the ajax tables which actually contains
|
|
* the content for the categories detail view, which is generated in getDataView.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see CategoriesController::getDataView() method that generates the JSON response
|
|
* @param $id
|
|
* @return \Illuminate\Contracts\View\View
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
* @since [v1.8]
|
|
*/
|
|
public function show($id)
|
|
{
|
|
$this->authorize('view', Category::class);
|
|
if ($category = Category::find($id)) {
|
|
|
|
if ($category->category_type=='asset') {
|
|
$category_type = 'hardware';
|
|
$category_type_route = 'assets';
|
|
} elseif ($category->category_type=='accessory') {
|
|
$category_type = 'accessories';
|
|
$category_type_route = 'accessories';
|
|
} else {
|
|
$category_type = $category->category_type;
|
|
$category_type_route = $category->category_type.'s';
|
|
}
|
|
return view('categories/view', compact('category'))
|
|
->with('category_type',$category_type)
|
|
->with('category_type_route',$category_type_route);
|
|
}
|
|
|
|
// Prepare the error message
|
|
// Redirect to the user management page
|
|
return redirect()->route('categories.index')
|
|
->with('error', trans('admin/categories/message.does_not_exist'));
|
|
}
|
|
}
|