mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-21 03:15:45 -08:00
Merge branch 'snipeit_v7_laravel10' into chore/sc-25656/minus_icon_for_fieldsets
This commit is contained in:
snipe
GitHub
commit
b3fe10baa8
12
.github/workflows/tests-sqlite.yml
vendored
12
.github/workflows/tests-sqlite.yml
vendored
|
|
@ -46,11 +46,13 @@ jobs:
|
|||
- name: Install Dependencies
|
||||
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
|
||||
|
||||
- name: Generate key
|
||||
run: php artisan key:generate
|
||||
|
||||
- name: Directory Permissions
|
||||
run: chmod -R 777 storage bootstrap/cache
|
||||
- name: Setup Laravel
|
||||
env:
|
||||
DB_CONNECTION: sqlite_testing
|
||||
run: |
|
||||
php artisan key:generate
|
||||
php artisan migrate --force
|
||||
chmod -R 777 storage bootstrap/cache
|
||||
|
||||
- name: Execute tests (Unit and Feature tests) via PHPUnit
|
||||
env:
|
||||
|
|
|
|||
|
|
@ -241,6 +241,8 @@ return [
|
|||
'requested_assets' => 'Requested Assets',
|
||||
'requested_assets_menu' => 'Requested Assets',
|
||||
'request_canceled' => 'Request Canceled',
|
||||
'request_item' => 'Request this item',
|
||||
'external_link_tooltip' => 'External link to',
|
||||
'save' => 'Save',
|
||||
'select_var' => 'Select :thing... ', // this will eventually replace all of our other selects
|
||||
'select' => 'Select',
|
||||
|
|
@ -398,8 +400,9 @@ return [
|
|||
'accessory_name' => 'Accessory Name:',
|
||||
'clone_item' => 'Clone Item',
|
||||
'checkout_tooltip' => 'Check this item out',
|
||||
'checkin_tooltip' => 'Check this item in',
|
||||
'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
|
||||
'checkout_user_tooltip' => 'Check this item out to a user',
|
||||
'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
|
||||
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
|
||||
'maintenance_mode_title' => 'System Temporarily Unavailable',
|
||||
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
|
||||
|
|
@ -501,6 +504,7 @@ return [
|
|||
'import_note' => 'Imported using csv importer',
|
||||
],
|
||||
'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
|
||||
'checked_out_to_fields' => 'Checked Out To Fields',
|
||||
'percent_complete' => '% complete',
|
||||
'uploading' => 'Uploading... ',
|
||||
'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? 'You can choose to check this asset in to a location other than the default location of '.$asset->defaultLoc->name.' if one is set.' : null, 'hide_location_radio' => true])
|
||||
@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? trans('general.checkin_to_diff_location', ['default_location' => $asset->defaultLoc->name]) : null, 'hide_location_radio' => true])
|
||||
|
||||
<!-- Checkout/Checkin Date -->
|
||||
<div class="form-group{{ $errors->has('checkin_at') ? ' has-error' : '' }}">
|
||||
|
|
|
|||
|
|
@ -738,7 +738,11 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
|
|||
{{ trans('general.activity_report') }}
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a href="{{ url('reports/custom') }}" {{ (Request::is('reports/custom') ? ' class="active"' : '') }}>
|
||||
{{ trans('general.custom_report') }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ route('reports.audit') }}" {{ (Request::is('reports.audit') ? ' class="active"' : '') }}>
|
||||
{{ trans('general.audit_report') }}</a>
|
||||
|
|
@ -768,11 +772,6 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
|
|||
{{ trans('general.accessory_report') }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ url('reports/custom') }}" {{ (Request::is('reports/custom') ? ' class="active"' : '') }}>
|
||||
{{ trans('general.custom_report') }}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
@endcan
|
||||
|
|
|
|||
|
|
@ -459,9 +459,9 @@
|
|||
// The user is allowed to check items in
|
||||
} else if (row.available_actions.checkin == true) {
|
||||
if (row.assigned_to) {
|
||||
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
|
||||
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
|
||||
} else if (row.assigned_pivot_id) {
|
||||
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
|
||||
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -479,7 +479,7 @@
|
|||
} else if (value.available_actions.cancel == true) {
|
||||
return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-danger btn-sm" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button></form>';
|
||||
} else if (value.available_actions.request == true) {
|
||||
return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-primary btn-sm" data-tooltip="true" title="Request this item">{{ trans('button.request') }}</button></form>';
|
||||
return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-primary btn-sm" data-tooltip="true" title="{{ trans('general.request_item') }}">{{ trans('button.request') }}</button></form>';
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -573,7 +573,7 @@
|
|||
|
||||
if (value) {
|
||||
if ((value.indexOf("{") === -1) || (value.indexOf("}") ===-1)) {
|
||||
return '<nobr><a href="' + value + '" target="_blank" title="External link to ' + value + '" data-tooltip="true"><i class="fa fa-external-link"></i> ' + value + '</a></nobr>';
|
||||
return '<nobr><a href="' + value + '" target="_blank" title="{{ trans('general.external_link_tooltip') }} ' + value + '" data-tooltip="true"><i class="fa fa-external-link"></i> ' + value + '</a></nobr>';
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@
|
|||
|
||||
<!-- User fields -->
|
||||
|
||||
<h2>{{ trans('general.checked_out_to') }} {{ trans('general.fields') }}:</h2>
|
||||
<h2>{{ trans('general.checked_out_to_fields') }}: </h2>
|
||||
|
||||
<label class="form-control">
|
||||
{{ Form::checkbox('assigned_to', '1', '1') }}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,10 @@
|
|||
namespace Tests\Feature\Settings;
|
||||
|
||||
use App\Models\User;
|
||||
use Tests\Support\InteractsWithSettings;
|
||||
use Tests\TestCase;
|
||||
|
||||
class BrandingSettingsTest extends TestCase
|
||||
{
|
||||
use InteractsWithSettings;
|
||||
|
||||
public function testSiteNameIsRequired()
|
||||
{
|
||||
$this->actingAs(User::factory()->superuser()->create())
|
||||
|
|
|
|||
Loading…
Reference in a new issue