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 remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black.css
#	public/css/dist/skins/skin-black.min.css
#	public/css/dist/skins/skin-blue.css
#	public/css/dist/skins/skin-blue.min.css
#	public/css/dist/skins/skin-green.css
#	public/css/dist/skins/skin-green.min.css
#	public/css/dist/skins/skin-orange.css
#	public/css/dist/skins/skin-orange.min.css
#	public/css/dist/skins/skin-purple.css
#	public/css/dist/skins/skin-purple.min.css
#	public/css/dist/skins/skin-red.css
#	public/css/dist/skins/skin-red.min.css
#	public/css/dist/skins/skin-yellow.css
#	public/css/dist/skins/skin-yellow.min.css
#	public/mix-manifest.json
This commit is contained in:
snipe 2022-05-18 17:21:32 -07:00
parent c0d352dd7d deda1c2fd6
commit 61a6c83418
27 changed files with 207 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Console/Commands/RegenerateAssetTags.php
View file

@ -60,7 +60,7 @@ class RegenerateAssetTags extends Command
}
foreach ($total_assets as $asset) {
$start_tag++;
$output['info'][] = 'Asset tag:'.$asset->asset_tag;
$asset->asset_tag = $settings->auto_increment_prefix.$settings->auto_increment_prefix.$start_tag;
@ -72,8 +72,15 @@ class RegenerateAssetTags extends Command
// Use forceSave here to override model level validation
$asset->forceSave();
$start_tag++;
if ($bar) {
$bar->advance();
}
}
$settings->next_auto_tag_base = Asset::zerofill($start_tag, $settings->zerofill_count);
$settings->save();
$bar->finish();
$this->info("\n");

6
app/Http/Controllers/Users/BulkUsersController.php
View file

@ -91,8 +91,10 @@ class BulkUsersController extends Controller
->conditionallyAddItem('company_id')
->conditionallyAddItem('locale')
->conditionallyAddItem('remote')
->conditionallyAddItem('ldap_import')
->conditionallyAddItem('activated');
// If the manager_id is one of the users being updated, generate a warning.
if (array_search($request->input('manager_id'), $user_raw_array)) {
$manager_conflict = true;
@ -107,7 +109,7 @@ class BulkUsersController extends Controller
User::whereIn('id', $user_raw_array)
->where('id', '!=', Auth::id())->update($this->update_array);
if(array_key_exists('location_id', $this->update_array)){
if (array_key_exists('location_id', $this->update_array)){
Asset::where('assigned_type', User::class)
->whereIn('assigned_to', $user_raw_array)
->update(['location_id' => $this->update_array['location_id']]);

BIN
public/css/dist/skins/skin-black.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-black.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-blue.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-blue.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-green.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-green.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-orange.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-orange.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-purple.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-purple.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-red.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-red.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-yellow.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-yellow.min.css vendored
View file

Binary file not shown.

28
public/mix-manifest.json
View file

@ -1,23 +1,23 @@
{
"/js/build/app.js": "/js/build/app.js?id=1218df365997eb1079ea",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=73366b2d1a77d1ba880e",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=9f6ae16efc6ddadf0ad4",
"/css/build/overrides.css": "/css/build/overrides.css?id=21281fb933786f40e97c",
"/css/build/app.css": "/css/build/app.css?id=a05de1e55dcc50ddba9a",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=40a6f3c46ef38d996f49",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=25ef31748fefadf36b18",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=1da067e3b29fa4025fab",
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=b39ee82b48cc27c648ca",
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=55ce0f4b9f43b17c8ca7",
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=76a13b403f77351926dc",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=d3a804c1a2592b823227",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=b455da82eb04b8629f2d",
"/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=ebdacfffd0e8def6214a",
"/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=b10a90616ad32b5bedf7",
"/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=92330c5da2593fedb6b5",
"/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=7f4d9d84e507abe268f7",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=72a21ceded782ed22531",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=89fcb616f2b14565cfd3",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=537a7214eb6eb2ddb6cb",
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=f46ff1c860ae9e87d484",
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=f140a248b0153fa42a1e",
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=d14248e210b998d85641",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=3654491c6565f7dc9bb4",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=5db84784498519ee10aa",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=1c8d372f8457ed3d26c2",
"/css/dist/all.css": "/css/dist/all.css?id=b657d018489da88020dd",
"/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
"/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
@ -27,19 +27,19 @@
"/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f3",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=8b909f5a1792dcc78a4b",
"/js/dist/all.js": "/js/dist/all.js?id=e25ec49ad10591b90f1a",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=f140a248b0153fa42a1e",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=d14248e210b998d85641",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=f46ff1c860ae9e87d484",
"/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=89fcb616f2b14565cfd3",
"/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=537a7214eb6eb2ddb6cb",
"/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=72a21ceded782ed22531",
"/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=73366b2d1a77d1ba880e",
"/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=9f6ae16efc6ddadf0ad4",
"/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=55ce0f4b9f43b17c8ca7",
"/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=d3a804c1a2592b823227",
"/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=b455da82eb04b8629f2d",
"/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=76a13b403f77351926dc",
"/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=5db84784498519ee10aa",
"/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=1c8d372f8457ed3d26c2",
"/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=7f4d9d84e507abe268f7",
"/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=b10a90616ad32b5bedf7",
"/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=92330c5da2593fedb6b5",
"/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=ebdacfffd0e8def6214a",
"/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=25ef31748fefadf36b18",
"/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=1da067e3b29fa4025fab",
"/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=b39ee82b48cc27c648ca",
"/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=3654491c6565f7dc9bb4"
}

20
resources/assets/less/skins/skin-black.less
View file

@ -102,6 +102,26 @@ a {
.text-primary {
color: darken(@black, 20%);
}
:root {
--button-default: darken(@black, 15%);
--button-primary: darken(@black, 25%);
--button-hover: darken(@black, 30%);
--header: @black; /* Use same as Header picker */
--text-main: #BBB;
--text-sub: #9b9b9b;
--link: #AAA; /* Use same as Header picker, lighten by 70% */
--visited-link: lighten(@black, 40%); /* Use same as Header picker, lighten by 70% */
--hover-link: lighten(@black, 45%); /* Use same as Header picker, lighten by 70% */
--nav-link: #FFF; /* Use same as Header picker */
--light-link: #fff; /* Use same as Header picker */
}
a:link {
color: var(--link);
}
a:visited {
color: var(--visited-link);
}
.skin-black .main-header .navbar .nav>li>a, .skin-black .main-header .navbar .nav>li>a {
text-decoration: none;

20
resources/assets/less/skins/skin-blue.less
View file

@ -109,6 +109,26 @@ a {
color: @light-blue;
}
}
:root {
--button-default: darken(@blue, 15%);
--button-primary: darken(@blue, 25%);
--button-hover: darken(@blue, 30%);
--header: @blue; /* Use same as Header picker */
--text-main: #BBB;
--text-sub: #9b9b9b;
--link: #1978D4; /* Use same as Header picker, lighten by 70% */
--visited-link: #3c8dbc ; /* Use same as Header picker, lighten by 70% */
--hover-link: #4B77BE; /* Use same as Header picker, lighten by 70% */
--nav-link: #FFF; /* Use same as Header picker */
--light-link: #fff; /* Use same as Header picker */
}
a:link {
color: var(--link);
}
a:visited {
color: var(--visited-link);
}
.text-primary {
color: darken(@light-blue, 20%);

22
resources/assets/less/skins/skin-green.less
View file

@ -6,7 +6,20 @@
@import "../bootstrap-less/variables.less";
@import "../variables.less";
@import "../mixins.less";
:root{
--visited-link: #5D995D; /* Use same as Header picker, lighten by 70% */
--background: #222;
--back-main: #333;
--back-sub: #3d4144;
--back-sub-alt: rgba(0, 0, 0, 0.36);
--button-default: darken(@green, 15%);
--button-primary: darken(@green, 25%);
--button-hover: darken(@green, 30%);
--header: @green; /* Use same as Header picker */
--text-main: #BBB;
--text-sub: #9b9b9b;
--link: #28A228; /* Use same as Header picker, lighten by 70% */
}
.skin-green {
//Navbar
.main-header {
@ -85,6 +98,13 @@
}
}
a:link {
color: var(--link);
}
a:visited {
color: var(--visited-link);
}
a {
color: @green;

20
resources/assets/less/skins/skin-orange.less
View file

@ -99,6 +99,26 @@ a {
.text-primary {
color: darken(@orange, 20%);
}
:root {
--button-default: darken(@orange, 15%);
--button-primary: darken(@orange, 25%);
--button-hover: darken(@orange, 30%);
--header: @orange; /* Use same as Header picker */
--text-main: #BBB;
--text-sub: #9b9b9b;
--link: #D43900; /* Use same as Header picker, lighten by 70% */
--visited-link: #D46A43; /* Use same as Header picker, lighten by 70% */
--hover-link: #FF4500; /* Use same as Header picker, lighten by 70% */
--nav-link: #FFF; /* Use same as Header picker */
--light-link: #fff; /* Use same as Header picker */
}
a:link {
color: var(--link);
}
a:visited {
color: var(--visited-link);
}
.fixed-table-container tbody .selected td {
background-color: #fff8af;

21
resources/assets/less/skins/skin-purple.less
View file

@ -100,6 +100,27 @@ a {
color: darken(@purple, 20%);
}
:root {
--button-default: darken(@purple, 15%);
--button-primary: darken(@purple, 25%);
--button-hover: darken(@purple, 30%);
--header: @purple; /* Use same as Header picker */
--text-main: #BBB;
--text-sub: #9b9b9b;
--link: #9370DB; /* Use same as Header picker, lighten by 70% */
--visited-link: #B93CF6; /* Use same as Header picker, lighten by 70% */
--hover-link: #BF55EC; /* Use same as Header picker, lighten by 70% */
--nav-link: #FFF; /* Use same as Header picker */
--light-link: #fff; /* Use same as Header picker */
}
a:link {
color: var(--link);
}
a:visited {
color: var(--visited-link);
}
.fixed-table-container tbody .selected td {
background-color: #fff8af;
}

22
resources/assets/less/skins/skin-red.less
View file

@ -100,6 +100,28 @@ a {
color: darken(@red, 20%);
}
:root {
--button-default: darken(@red, 15%);
--button-primary: darken(@red, 25%);
--button-hover: darken(@red, 30%);
--header: @red; /* Use same as Header picker */
--text-main: #BBB;
--text-alt: #222;
--text-sub: #9b9b9b;
--link: #e00000; /* Use same as Header picker, lighten by 70% */
--visited-link: #D24D57; /* Use same as Header picker, lighten by 70% */
--hover-link: #D24D57; /* Use same as Header picker, lighten by 70% */
--nav-link: #FFF; /* Use same as Header picker */
--light-link: #fff; /* Use same as Header picker */
}
a:link {
color: var(--link);
}
a:visited {
color: var(--visited-link);
}
.fixed-table-container tbody .selected td {
background-color: #fff8af;
}

21
resources/assets/less/skins/skin-yellow.less
View file

@ -100,6 +100,27 @@ a {
color: darken(@yellow, 20%);
}
:root {
--button-default: darken(@yellow, 15%);
--button-primary: darken(@yellow, 25%);
--button-hover: darken(@yellow, 30%);
--header: @yellow; /* Use same as Header picker */
--text-main: #BBB;
--text-sub: #9b9b9b;
--link: lighten(@yellow, 10%); /* Use same as Header picker, lighten by 70% */
--visited-link: lighten(@yellow, 20%); /* Use same as Header picker, lighten by 70% */
--hover-link: lighten(@yellow, 45%); /* Use same as Header picker, lighten by 70% */
--nav-link: #FFF; /* Use same as Header picker */
--light-link: #fff; /* Use same as Header picker */
}
a:link {
color: var(--link);
}
a:visited {
color: var(--visited-link);
}
.fixed-table-container tbody .selected td {
background-color: #fff8af;
}

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

@ -356,4 +356,5 @@ return [
'checkout_user_tooltip' => 'Check this item out to a user',
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavilable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
];

7
resources/views/hardware/edit.blade.php
View file

@ -151,7 +151,12 @@
//now re-populate the custom fields based on the previously saved values
$('#custom_fields_content').find('input,select').each(function (index,elem) {
if(transformed_oldvals[elem.name]) {
$(elem).val(transformed_oldvals[elem.name]).trigger('change'); //the trigger is for select2-based objects, if we have any
{{-- If there already *is* is a previously-input 'transformed_oldvals' handy,
overwrite with that previously-input value *IF* this is an edit of an existing item *OR*
if there is no new default custom field value coming from the model --}}
if({{ $item->id ? 'true' : 'false' }} || $(elem).val() == '') {
$(elem).val(transformed_oldvals[elem.name]).trigger('change'); //the trigger is for select2-based objects, if we have any
}
}
});

37
resources/views/users/bulk-edit.blade.php
View file

@ -13,6 +13,12 @@
{{-- Page content --}}
@section('content')
<style>
.radio {
margin-left: -20px;
}
</style>
<div class="row">
<div class="col-md-8 col-md-offset-2">
@ -69,28 +75,43 @@
{{ trans('admin/users/general.remote') }}
</div>
<div class="col-sm-9">
<div class="checkbox">
<div class="radio">
<label for="remote">
{{ Form::radio('remote', '', true, ['aria-label'=>'remote']) }} {{ trans('general.do_not_change') }} <br>
{{ Form::radio('remote', '1', old('remote'), ['aria-label'=>'remote']) }} {{ trans('admin/users/general.remote_label') }}<br>
{{ Form::radio('remote', '0', old('remote'), ['aria-label'=>'remote']) }} {{ trans('admin/users/general.not_remote_label') }}
{{ Form::radio('remote', '', true, ['aria-label'=>'remote', 'class'=>'minimal']) }} {{ trans('general.do_not_change') }} <br>
{{ Form::radio('remote', '1', old('remote'), ['aria-label'=>'remote', 'class'=>'minimal']) }} {{ trans('admin/users/general.remote_label') }}<br>
{{ Form::radio('remote', '0', old('remote'), ['aria-label'=>'remote', 'class'=>'minimal']) }} {{ trans('admin/users/general.not_remote_label') }}
</label>
</div>
</div>
</div> <!--/form-group-->
<!-- ldap_sync -->
<div class="form-group">
<div class="col-sm-3 control-label">
{{ trans('general.ldap_sync') }}
</div>
<div class="col-sm-9">
<div class="radio">
<label for="ldap_import">
{{ Form::radio('ldap_import', '', true, ['aria-label'=>'ldap_import', 'class'=>'minimal']) }} {{ trans('general.do_not_change') }} <br>
{{ Form::radio('ldap_import', '0', old('ldap_import'), ['aria-label'=>'ldap_import', 'class'=>'minimal']) }} {{ trans('general.ldap_import') }}
</label>
</div>
</div>
</div> <!--/form-group-->
<!-- activated -->
<div class="form-group">
<div class="col-sm-3 control-label">
{{ trans('general.activated') }}
</div>
<div class="col-sm-9">
<div class="checkbox">
<div class="radio">
<label for="activated">
{{ Form::radio('remote', '', true, ['aria-label'=>'activated']) }} {{ trans('general.do_not_change') }} <br>
{{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated']) }} {{ trans('general.login_enabled')}} <br>
{{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated']) }} {{ trans('admin/users/general.user_deactivated')}}
{{ Form::radio('activated', '', true, ['aria-label'=>'activated', 'class'=>'minimal']) }} {{ trans('general.do_not_change') }} <br>
{{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }} {{ trans('general.login_enabled')}} <br>
{{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }} {{ trans('admin/users/general.user_deactivated')}}
</label>
</div>