Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

[v1] Include validation erorrs for migration (#3660)

Browse Source 
* Add

* Fix
This commit is contained in:
Benjamin Beganović 2020-04-29 14:33:55 +02:00 committed by GitHub
parent 33f70de451
commit 56a9bc2bdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/migration/companies.blade.php
View File

@ -18,8 +18,8 @@
@foreach($companies as $company) @foreach($companies as $company)
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox" name="companies[{{ $company->id }}][id]" id="company1" value="{{ $company->id }}" checked> <input class="form-check-input" id="company_{{ $company->id }}" type="checkbox" name="companies[{{ $company->id }}][id]" id="company1" value="{{ $company->id }}" checked>
<label class="form-check-label" for="company1"> <label class="form-check-label" for="company_{{ $company->id }}">
Name: {{ $company->settings->name }} ID: {{ $company->id }} Name: {{ $company->settings->name }} ID: {{ $company->id }}
</label> </label>
</div> </div>

2
resources/views/migration/endpoint.blade.php
View File

@ -4,6 +4,8 @@
@parent @parent
@include('accounts.nav', ['selected' => ACCOUNT_MANAGEMENT]) @include('accounts.nav', ['selected' => ACCOUNT_MANAGEMENT])
@include('migration.includes.errors')
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">{!! trans('texts.welcome_to_the_new_version') !!}</h3> <h3 class="panel-title">{!! trans('texts.welcome_to_the_new_version') !!}</h3>

8
resources/views/migration/includes/errors.blade.php
View File

@ -4,4 +4,12 @@
<p>{!! $error !!}</p> <p>{!! $error !!}</p>
@endforeach @endforeach
</div> </div>
@endif
@if($errors->any())
<div class="alert alert-danger">
@foreach($errors->all() as $error)
<p>{!! $error !!}</p>
@endforeach
</div>
@endif @endif