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

Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2021-05-12 16:51:39 -07:00
parent 3f559c4a50 6ed5dff1a5
commit 1a95337db1
3 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Console/Commands/ResetDemoSettings.php
View file

@ -81,6 +81,8 @@ class ResetDemoSettings extends Command
$user->save(); $user->save();
} }
\Storage::disk('local_public')->put('snipe-logo.png', file_get_contents(public_path('img/demo/snipe-logo.png')));
\Storage::disk('local_public')->put('snipe-logo-lg.png', file_get_contents(public_path('img/demo/snipe-logo-lg.png')));
} }

4
database/seeds/SettingsSeeder.php
View file

@ -42,8 +42,8 @@ class SettingsSeeder extends Seeder
// Copy the logos from the img/demo directory // Copy the logos from the img/demo directory
Storage::disk('public')->put(public_path('uploads/snipe-logo.png'), file_get_contents(public_path('img/demo/snipe-logo.png'))); Storage::disk('local_public')->put('snipe-logo.png', file_get_contents(public_path('img/demo/snipe-logo.png')));
Storage::disk('public')->put(public_path('uploads/snipe-logo-lg.png'), file_get_contents(public_path('img/demo/snipe-logo-lg.png'))); Storage::disk('local_public')->put('snipe-logo-lg.png', file_get_contents(public_path('img/demo/snipe-logo-lg.png')));
} }
} }

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

@ -722,7 +722,28 @@
{{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }} {{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-2">
<strong>
Labels
</strong>
</div>
<div class="col-md-6">
{{ Form::open([
'method' => 'POST',
'route' => ['hardware/bulkedit'],
'class' => 'form-inline',
'id' => 'bulkForm']) }}
<div id="toolbar">
<input type="hidden" name="bulk_actions" value="labels" />
<input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
<button class="btn btn-primary" id="bulkEdit" >{{ trans_choice('button.generate_labels', 1) }}</button>
</div>
{{ Form::close() }}
</div>
</div>
</div> <!-- end row-striped --> </div> <!-- end row-striped -->
</div><!-- /col-md-8 --> </div><!-- /col-md-8 -->