DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-10-12 16:01:17 -07:00
parent e721665fd8 80279a95ae
commit 43479efed0
9 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.all-contributorsrc
View file

@ -2736,7 +2736,7 @@
"avatar_url": "https://avatars.githubusercontent.com/u/111710123?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/111710123?v=4",
"profile": "https://github.com/Vautia", "profile": "https://github.com/Vautia",
"contributions": [ "contributions": [
"security" "code"
] ]
}, },
{ {
@ -2756,6 +2756,15 @@
"contributions": [ "contributions": [
"code" "code"
] ]
},
{
"login": "nh314",
"name": "Phan Nguyen",
"avatar_url": "https://avatars.githubusercontent.com/u/6006620?v=4",
"profile": "https://github.com/nh314",
"contributions": [
"code"
]
} }
] ]
} }

2
.github/workflows/SA-codeql.yml vendored
View file

@ -26,7 +26,7 @@ jobs:
language: [ 'javascript' ] language: [ 'javascript' ]
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v3.1.0
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

2
.github/workflows/codacy-analysis.yml vendored
View file

@ -32,7 +32,7 @@ jobs:
steps: steps:
# Checkout the repository to the GitHub Actions runner # Checkout the repository to the GitHub Actions runner
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v3.1.0
# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI - name: Run Codacy Analysis CLI

2
.github/workflows/docker-alpine.yml vendored
View file

@ -41,7 +41,7 @@ jobs:
steps: steps:
# https://github.com/actions/checkout # https://github.com/actions/checkout
- name: Checkout codebase - name: Checkout codebase
uses: actions/checkout@v2 uses: actions/checkout@v3.1.0
# https://github.com/docker/setup-buildx-action # https://github.com/docker/setup-buildx-action
- name: Setup Docker Buildx - name: Setup Docker Buildx

2
.github/workflows/docker.yml vendored
View file

@ -41,7 +41,7 @@ jobs:
steps: steps:
# https://github.com/actions/checkout # https://github.com/actions/checkout
- name: Checkout codebase - name: Checkout codebase
uses: actions/checkout@v2 uses: actions/checkout@v3.1.0
# https://github.com/docker/setup-buildx-action # https://github.com/docker/setup-buildx-action
- name: Setup Docker Buildx - name: Setup Docker Buildx

2
app/Http/Controllers/Api/LicenseSeatsController.php
View file

@ -39,7 +39,7 @@ class LicenseSeatsController extends Controller
} }
$total = $seats->count(); $total = $seats->count();
$offset = (($seats) && (request('offset') > $total)) ? 0 : request('offset', 0); $offset = (($seats) && (request('offset') >= $total)) ? 0 : request('offset', 0);
$limit = request('limit', 50); $limit = request('limit', 50);
$seats = $seats->skip($offset)->take($limit)->get(); $seats = $seats->skip($offset)->take($limit)->get();

2
app/Models/Loggable.php
View file

@ -189,7 +189,7 @@ trait Loggable
$params = [ $params = [
'item' => $log->item, 'item' => $log->item,
'filename' => $log->filename, 'filename' => $log->filename,
'admin' => $log->user, 'admin' => $log->admin,
'location' => ($location) ? $location->name : '', 'location' => ($location) ? $location->name : '',
'note' => $note, 'note' => $note,
]; ];

2
config/version.php
View file

@ -6,5 +6,5 @@ return array (
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g61fa0bda4', 'hash_version' => 'g61fa0bda4',
'full_hash' => 'v6.0.11-145-g61fa0bda4', 'full_hash' => 'v6.0.11-145-g61fa0bda4',
'branch' => 'master', 'branch' => 'develop',
); );

2
resources/views/licenses/edit.blade.php
View file

@ -34,7 +34,7 @@
</div> </div>
@include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id']) @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true']) @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id',])
<!-- Licensed to name --> <!-- Licensed to name -->
<div class="form-group {{ $errors->has('license_name') ? ' has-error' : '' }}"> <div class="form-group {{ $errors->has('license_name') ? ' has-error' : '' }}">