DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-02-16 21:19:03 -08:00
parent 5302108556 d8fc50c351
commit baf51eb430
14 changed files with 130 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
app/Helpers/Helper.php
View file

@ -731,5 +731,62 @@ class Helper
}
// Nicked from Drupal :)
// Returns a file size limit in bytes based on the PHP upload_max_filesize
// and post_max_size
public static function file_upload_max_size() {
static $max_size = -1;
if ($max_size < 0) {
// Start with post_max_size.
$post_max_size = Helper::parse_size(ini_get('post_max_size'));
if ($post_max_size > 0) {
$max_size = $post_max_size;
}
// If upload_max_size is less, then reduce. Except if upload_max_size is
// zero, which indicates no limit.
$upload_max = Helper::parse_size(ini_get('upload_max_filesize'));
if ($upload_max > 0 && $upload_max < $max_size) {
$max_size = $upload_max;
}
}
return $max_size;
}
public static function file_upload_max_size_readable() {
static $max_size = -1;
if ($max_size < 0) {
// Start with post_max_size.
$post_max_size = Helper::parse_size(ini_get('post_max_size'));
if ($post_max_size > 0) {
$max_size = ini_get('post_max_size');
}
// If upload_max_size is less, then reduce. Except if upload_max_size is
// zero, which indicates no limit.
$upload_max = Helper::parse_size(ini_get('upload_max_filesize'));
if ($upload_max > 0 && $upload_max < $max_size) {
$max_size = ini_get('upload_max_filesize');
}
}
return $max_size;
}
public static function parse_size($size) {
$unit = preg_replace('/[^bkmgtpezy]/i', '', $size); // Remove the non-unit characters from the size.
$size = preg_replace('/[^0-9\.]/', '', $size); // Remove the non-numeric characters from the size.
if ($unit) {
// Find the position of the unit in the ordered string which is the power of magnitude to multiply a kilobyte by.
return round($size * pow(1024, stripos('bkmgtpezy', $unit[0])));
}
else {
return round($size);
}
}
}

2
app/Http/Controllers/ManufacturersController.php
View file

@ -67,7 +67,7 @@ class ManufacturersController extends Controller
public function store(ImageUploadRequest $request)
{
$this->authorize('edit', Manufacturer::class);
$this->authorize('create', Manufacturer::class);
$manufacturer = new Manufacturer;
$manufacturer->name = $request->input('name');
$manufacturer->user_id = Auth::user()->id;

10
database/migrations/2016_02_19_070119_add_remember_token_to_users_table.php
View file

@ -12,9 +12,11 @@ class AddRememberTokenToUsersTable extends Migration
*/
public function up()
{
Schema::table('users', function (Blueprint $table) {
$table->text('remember_token')->nullable()->default(NULL);
});
if (!Schema::hasColumn('users', 'remember_token')) {
Schema::table('users', function (Blueprint $table) {
$table->text('remember_token')->nullable()->default(null);
});
}
}
/**
@ -25,7 +27,7 @@ class AddRememberTokenToUsersTable extends Migration
public function down()
{
Schema::table('users', function (Blueprint $table) {
//
$table->dropColumn('remember_token');
});
}
}

2
database/migrations/2016_02_19_073625_create_password_resets_table.php
View file

@ -32,6 +32,6 @@ class CreatePasswordResetsTable extends Migration
*/
public function down()
{
//
Schema::dropIfExists('password_resets');
}
}

BIN
public/js/build/all.js
View file

Binary file not shown.

BIN
public/js/dist/all.js vendored
View file

Binary file not shown.

BIN
public/js/extensions/sticky-header/bootstrap-table-sticky-header.js vendored
View file

Binary file not shown.

4
public/mix-manifest.json
View file

@ -8,7 +8,7 @@
"/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72",
"/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b",
"/css/dist/all.css": "/css/dist/all.css?id=dc1449877e0f8abedc47",
"/js/dist/all.js": "/js/dist/all.js?id=4e5e7295e9a59e718567",
"/js/dist/all.js": "/js/dist/all.js?id=d3af8331997bd82e4ec4",
"/css/build/all.css": "/css/build/all.css?id=dc1449877e0f8abedc47",
"/js/build/all.js": "/js/build/all.js?id=4e5e7295e9a59e718567"
"/js/build/all.js": "/js/build/all.js?id=d3af8331997bd82e4ec4"
}

19
resources/assets/js/snipeit.js
View file

@ -322,6 +322,25 @@ $(document).ready(function () {
// ------------------------------------------------
// File size validation
$('#uploadFile').bind('change', function() {
$('#upload-file-status').removeClass('text-success').removeClass('text-danger');
$('.goodfile').remove();
$('.badfile').remove();
var max_size = $('#uploadFile').data('maxsize');
var actual_size = this.files[0].size;
if (actual_size > max_size) {
$('#upload-file-status').addClass('text-danger').removeClass('help-block').prepend('<i class="badfile fa fa-times"></i> ');
} else {
$('#upload-file-status').addClass('text-success').removeClass('help-block').prepend('<i class="goodfile fa fa-check"></i> ');
}
$('#upload-file-info').html(this.files[0].name);
});

2
resources/lang/en/general.php
View file

@ -97,7 +97,7 @@
'image' => 'Image',
'image_delete' => 'Delete Image',
'image_upload' => 'Upload Image',
'image_filetypes_help' => 'Accepted filetypes are jpg, png, gif, and svg.',
'image_filetypes_help' => 'Accepted filetypes are jpg, png, gif, and svg. Max upload size allowed is :size.',
'import' => 'Import',
'import-history' => 'Import History',
'asset_maintenance' => 'Asset Maintenance',

55
resources/views/hardware/view.blade.php
View file

@ -33,7 +33,16 @@
@section('content')
<div class="row">
@if (!$asset->model)
<div class="col-md-12">
<div class="callout callout-danger">
<h4>NO MODEL ASSOCIATED</h4>
<p>This will break things in weird and horrible ways. Edit this asset now to assign it a model. </p>
</div>
</div>
@endif
@if ($asset->deleted_at!='')
<div class="col-md-12">
<div class="alert alert-danger">
@ -148,7 +157,7 @@
</tr>
@endif
@if ($asset->model->manufacturer)
@if (($asset->model) && ($asset->model->manufacturer))
<tr>
<td>{{ trans('admin/hardware/form.manufacturer') }}</td>
<td>
@ -162,21 +171,21 @@
<li> {{ $asset->model->manufacturer->name }}</li>
@endcan
@if ($asset->model->manufacturer->url)
@if (($asset->model) && ($asset->model->manufacturer->url))
<li><i class="fa fa-globe"></i> <a href="{{ $asset->model->manufacturer->url }}">{{ $asset->model->manufacturer->url }}</a></li>
@endif
@if ($asset->model->manufacturer->support_url)
@if (($asset->model) && ($asset->model->manufacturer->support_url))
<li><i class="fa fa-life-ring"></i> <a href="{{ $asset->model->manufacturer->support_url }}">{{ $asset->model->manufacturer->support_url }}</a></li>
@endif
@if ($asset->model->manufacturer->support_phone)
@if (($asset->model) && ($asset->model->manufacturer->support_phone))
<li><i class="fa fa-phone"></i>
<a href="tel:{{ $asset->model->manufacturer->support_phone }}">{{ $asset->model->manufacturer->support_phone }}</a>
</li>
@endif
@if ($asset->model->manufacturer->support_email)
@if (($asset->model) && ($asset->model->manufacturer->support_email))
<li><i class="fa fa-envelope"></i> <a href="mailto:{{ $asset->model->manufacturer->support_email }}">{{ $asset->model->manufacturer->support_email }}</a></li>
@endif
</ul>
@ -188,7 +197,7 @@
<td>
{{ trans('general.category') }}</td>
<td>
@if ($asset->model->category)
@if (($asset->model) && ($asset->model->category))
@can('view', \App\Models\Category::class)
@ -208,15 +217,21 @@
<tr>
<td>
{{ trans('admin/hardware/form.model') }}</td>
{{ trans('admin/hardware/form.model') }}
</td>
<td>
@can('view', \App\Models\AssetModel::class)
<a href="{{ route('models.show', $asset->model->id) }}">
{{ $asset->model->name }}
</a>
@else
{{ $asset->model->name }}
@endcan
@if ($asset->model)
@can('view', \App\Models\AssetModel::class)
<a href="{{ route('models.show', $asset->model->id) }}">
{{ $asset->model->name }}
</a>
@else
{{ $asset->model->name }}
@endcan
@endif
</td>
</tr>
@ -224,12 +239,12 @@
<tr>
<td>{{ trans('admin/models/table.modelnumber') }}</td>
<td>
{{ $asset->model->model_number }}
{{ ($asset->model) ? $asset->model->model_number : ''}}
</td>
</tr>
@if ($asset->model->fieldset)
@if (($asset->model) && ($asset->model->fieldset))
@foreach($asset->model->fieldset->fields as $field)
<tr>
<td>
@ -326,7 +341,7 @@
</tr>
@endif
@if ($asset->depreciation)
@if (($asset->model) && ($asset->depreciation))
<tr>
<td>{{ trans('general.depreciation') }}</td>
<td>
@ -352,7 +367,7 @@
</tr>
@endif
@if ($asset->model->eol)
@if (($asset->model) && ($asset->model->eol))
<tr>
<td>{{ trans('admin/hardware/form.eol_rate') }}</td>
<td>
@ -448,7 +463,7 @@
<div class="col-md-4">
@if ($asset->image)
<img src="{{ url('/') }}/uploads/assets/{{{ $asset->image }}}" class="assetimg img-responsive">
@elseif ($asset->model->image!='')
@elseif (($asset->model) && ($asset->model->image!=''))
<img src="{{ url('/') }}/uploads/models/{{{ $asset->model->image }}}" class="assetimg img-responsive">
@endif

2
resources/views/layouts/default.blade.php
View file

@ -823,5 +823,7 @@
</script>
@endif
</body>
</html>

8
resources/views/partials/forms/edit/image-upload.blade.php
View file

@ -1,13 +1,13 @@
<div class="form-group {{ $errors->has('image') ? 'has-error' : '' }}">
<label class="col-md-3 control-label" for="image">{{ trans('general.image_upload') }}</label>
<div class="col-md-5">
<div class="col-md-9">
<label class="btn btn-default">
{{ trans('button.select_file') }}
<input type="file" name="image" accept="image/gif,image/jpeg,image/png,image/svg"
onchange="$('#upload-file-info').html(this.files[0].name)" style="display:none">
<input type="file" name="image" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/png,image/svg" style="display:none">
</label>
<span class='label label-default' id="upload-file-info"></span>
<p class="help-block">{{ trans('general.image_filetypes_help') }}</p>
<p class="help-block" id="upload-file-status">{{ trans('general.image_filetypes_help', ['size' => \App\Helpers\Helper::file_upload_max_size_readable()]) }}</p>
{!! $errors->first('image', '<span class="alert-msg">:message</span>') !!}
</div>
</div>

4
resources/views/partials/forms/edit/submit.blade.php
View file

@ -1,4 +1,4 @@
<div class="box-footer text-right">
<a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
<a class="btn btn-link text-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
</div>
</div>