diff --git a/.all-contributorsrc b/.all-contributorsrc index 885e00e07d..ba9f54a99b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -4171,6 +4171,15 @@ "contributions": [ "code" ] + }, + { + "login": "amedranogil", + "name": "Alejandro Medrano", + "avatar_url": "https://avatars.githubusercontent.com/u/6515064?v=4", + "profile": "https://www.lst.tfo.upm.es/alejandro-medrano/", + "contributions": [ + "code" + ] } ] } diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c3891c1b7c..7ab3810780 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -67,7 +67,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken | [
AlexanderWPapyrus](https://github.com/AlexanderWPapyrus)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=AlexanderWPapyrus "Code") | [
Alexandr Hacicheant](https://github.com/disc)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=disc "Code") | [
Hex](https://hex128.io/)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=hex128 "Code") | [
Arunas Skirius](https://github.com/arukompas)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=arukompas "Code") | [
Ben Periton](https://github.com/benperiton)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=benperiton "Code") | [
Byron Wolfman](https://wolfman.dev/)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=byronwolfman "Code") | [
Calvin](https://github.com/CalvinSchwartz)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=CalvinSchwartz "Code") | | [
Juan Font](https://github.com/juanfont)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=juanfont "Code") | [
Juho Taipale](https://github.com/juhotaipale)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=juhotaipale "Code") | [
Korvin Szanto](https://github.com/KorvinSzanto)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=KorvinSzanto "Code") | [
Lewis Foster](https://lewisfoster.foo/)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=sniff122 "Code") | [
Logan Swartzendruber](https://github.com/loganswartz)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=loganswartz "Code") | [
Lorenzo P.](https://github.com/lopezio)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=lopezio "Code") | [
Lukas Jung](https://github.com/m4us1ne)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=m4us1ne "Code") | | [
Ellie](https://leafedfox.xyz/)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=LeafedFox "Code") | [
GA Stamper](https://github.com/gastamper)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=gastamper "Code") | [
Guillaume Lefranc](https://github.com/gl-pup)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=gl-pup "Code") | [
Hajo MΓΆller](https://github.com/dasjoe)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=dasjoe "Code") | [
Istvan Basa](https://github.com/pottom)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=pottom "Code") | [
JJ Asghar](https://jjasghar.github.io/)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=jjasghar "Code") | [
James E. Msenga](https://github.com/JemCdo)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=JemCdo "Code") | -| [
Jan Felix Wiebe](https://github.com/jfwiebe)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=jfwiebe "Code") | [
Jo Drexl](https://www.nfon.com/)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=drexljo "Code") | [
Austin Sasko](https://github.com/austinsasko)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=austinsasko "Code") | [
Jasson](http://jassoncordones.github.io)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=JassonCordones "Code") | [
Okean](https://github.com/Tinyblargon)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=Tinyblargon "Code") | +| [
Jan Felix Wiebe](https://github.com/jfwiebe)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=jfwiebe "Code") | [
Jo Drexl](https://www.nfon.com/)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=drexljo "Code") | [
Austin Sasko](https://github.com/austinsasko)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=austinsasko "Code") | [
Jasson](http://jassoncordones.github.io)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=JassonCordones "Code") | [
Okean](https://github.com/Tinyblargon)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=Tinyblargon "Code") | [
Alejandro Medrano](https://www.lst.tfo.upm.es/alejandro-medrano/)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=amedranogil "Code") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index 954da30870..3b6b287334 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -85,6 +85,12 @@ class AssetModelsController extends Controller $assetmodels = $assetmodels->where('models.model_number', '=', $request->input('model_number')); } + if ($request->input('requestable') == 'true') { + $assetmodels = $assetmodels->where('models.requestable', '=', '1'); + } elseif ($request->input('requestable') == 'false') { + $assetmodels = $assetmodels->where('models.requestable', '=', '0'); + } + if ($request->filled('notes')) { $assetmodels = $assetmodels->where('models.notes', '=', $request->input('notes')); } diff --git a/docker/startup.sh b/docker/startup.sh index 7ca05b15d6..2ba4681870 100644 --- a/docker/startup.sh +++ b/docker/startup.sh @@ -100,14 +100,12 @@ chown -R docker:root /var/www/html/storage/framework/cache # Fix php settings if [ -v "PHP_UPLOAD_LIMIT" ] then - echo "Changing upload limit to ${PHP_UPLOAD_LIMIT}" - if [ -e /etc/php/*/apache2/php.ini ] + PHP_INI_FILE=$(find /etc/php/*/apache2/php.ini) + if [ -e $PHP_INI_FILE ] then - sed -i "s/^upload_max_filesize.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" /etc/php/*/apache2/php.ini - sed -i "s/^post_max_size.*/post_max_size = ${PHP_UPLOAD_LIMIT}M/" /etc/php/*/apache2/php.ini - else - sed -i "s/^upload_max_filesize.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" /etc/php*/php.ini - sed -i "s/^post_max_size.*/post_max_size = ${PHP_UPLOAD_LIMIT}M/" /etc/php*/php.ini + echo "Changing upload limit to ${PHP_UPLOAD_LIMIT}M in ${PHP_INI_FILE}" + sed -i "s/^upload_max_filesize.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" $PHP_INI_FILE + sed -i "s/^post_max_size.*/post_max_size = ${PHP_UPLOAD_LIMIT}M/" $PHP_INI_FILE fi fi