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 2020-01-22 16:07:46 -08:00
parent 159acf6788 313cacdb71
commit 56582614b6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Api/ImportController.php
View file

@ -10,7 +10,7 @@ use App\Models\Asset;
use App\Models\Company; use App\Models\Company;
use App\Models\Import; use App\Models\Import;
use Artisan; use Artisan;
use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use League\Csv\Reader; use League\Csv\Reader;
@ -41,7 +41,7 @@ class ImportController extends Controller
{ {
$this->authorize('import'); $this->authorize('import');
if (!config('app.lock_passwords')) { if (!config('app.lock_passwords')) {
$files = Input::file('files'); $files = Request::file('files');
$path = config('app.private_uploads').'/imports'; $path = config('app.private_uploads').'/imports';
$results = []; $results = [];
$import = new Import; $import = new Import;

2
resources/views/custom_fields/index.blade.php
View file

@ -53,7 +53,7 @@
@foreach($custom_fieldsets AS $fieldset) @foreach($custom_fieldsets AS $fieldset)
<tr> <tr>
<td> <td>
{{ link_to_route("fieldsets.show",$fieldset->name,['id' => $fieldset->id]) }} {{ link_to_route("fieldsets.show",$fieldset->name,['fieldset' => $fieldset->id]) }}
</td> </td>
<td> <td>
{{ $fieldset->fields->count() }} {{ $fieldset->fields->count() }}