DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 13:57:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into fixes/accessibility_fixes

Browse source
This commit is contained in:
snipe 2020-04-01 14:04:02 -07:00 committed by GitHub
parent 56c2740b68 120e224961
commit c906026acd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docker/startup.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# fix key if needed # fix key if needed
if [ -z "$APP_KEY" ] if [ -z "$APP_KEY" ]
@ -41,6 +41,14 @@ chown -R docker:root /var/lib/snipeit/data/*
chown -R docker:root /var/lib/snipeit/dumps chown -R docker:root /var/lib/snipeit/dumps
chown -R docker:root /var/lib/snipeit/keys chown -R docker:root /var/lib/snipeit/keys
# Fix php settings
if [ -v "PHP_UPLOAD_LIMIT" ]
then
echo "Changing upload limit to ${PHP_UPLOAD_LIMIT}"
sed -i "s/^upload_max_filesize.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" /etc/php/*/apache2/php.ini
fi
# If the Oauth DB files are not present copy the vendor files over to the db migrations # If the Oauth DB files are not present copy the vendor files over to the db migrations
if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ] if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]
then then

70
resources/views/importer/import.blade.php
View file

@ -16,6 +16,21 @@
[v-cloak] { [v-cloak] {
display:none; display:none;
} }
/* Rules for the div table */
.tbl_head {
font-weight: bold
}
.div_tbl {
display: table
}
.div_tbl_row {
display: table-row
}
.div_tbl_cell {
display: table-cell;
padding: 2px
}
</style> </style>
<div id="app"> <div id="app">
@ -53,33 +68,34 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12" style="padding-top: 30px;"> <div class="col-md-12" style="padding-top: 30px;">
<table class="table table-striped" id="upload-table"> <div class="table table-striped" id="upload-table">
<thead> <div class="div_tbl_row">
<th>File</th> <div class="tbl_head">File</div>
<th>Created</th> <div class="tbl_head">Created</div>
<th>Size</th> <div class="tbl_head">Size</div>
<th><span class="sr-only">Delete</span></th> <div class="tbl_head"></div>
</thead> </div>
<tbody>
<template v-for="currentFile in files"> <template v-for="currentFile in files">
<tr> <div class="div_tbl_row">
<td>@{{ currentFile.file_path }}</td> <div class="div_tbl_cell">@{{ currentFile.file_path }}</div>
<td>@{{ currentFile.created_at }} </td> <div class="div_tbl_cell">@{{ currentFile.created_at }} </div>
<td>@{{ currentFile.filesize }}</td> <div class="div_tbl_cell">@{{ currentFile.filesize }}</div>
<td>
<button class="btn btn-sm btn-info" @click="toggleEvent(currentFile.id)">Process</button> <div class="div_tbl_cell">
<button class="btn btn-sm btn-danger" @click="deleteFile(currentFile)"><i class="fa fa-trash icon-white" aria-hidden="true"></i></button> <button class="btn btn-sm btn-info" @click="toggleEvent(currentFile.id)">Process</button>
</td> <button class="btn btn-sm btn-danger" @click="deleteFile(currentFile)"><i class="fa fa-trash icon-white"></i></button>
</tr> </div>
<import-file </div>
:key="currentFile.id"
:file="currentFile" <import-file
:custom-fields="customFields" :key="currentFile.id"
@alert="updateAlert(alert)"> :file="currentFile"
</import-file> :custom-fields="customFields"
</template> @alert="updateAlert(alert)">
</tbody> </import-file>
</table> </template>
</div>
</div> </div>
</div> </div>
</div> </div>