DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -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 2016-07-27 20:30:25 -07:00
parent 288584cb60 e9eb5ad372
commit 07b70a8cd0
26 changed files with 1402 additions and 393 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
.gitignore vendored
View file

@ -1,49 +1,38 @@
/vendor
/node_modules
Homestead.yaml
Homestead.json
.env
tests/_output/*
.couscous
.DS_Store
public/uploads/models/*
public/uploads/avatars/*
public/uploads/suppliers/*
public/uploads/assets/*
public/uploads/users/*
.env
.idea
/bin/
/bootstrap/compiled.php
/node_modules
/vendor
app/database/*.sqlite
app/storage/meta/services.json
composer.phar
crowdin.yaml
Homestead.json
Homestead.yaml
output
phpDocumentor.phar
public/uploads/*.gif
public/uploads/*.jpg
public/uploads/*.png
public/uploads/*.tif
public/uploads/*.svg
storage/app/private_uploads/users/*
phpDocumentor.phar
output
tests/_support/_generated/*
/bootstrap/compiled.php
composer.phar
app/config/database.php
app/config/mail.php
app/database/*.sqlite
app/storage/meta/services.json
app/config/*/mail.php
app/config/*/session.php
app/config/*/database.php
app/config/*/app.php
app/config/*/ldap.php
public/packages/*
storage/logs/*
storage/debugbar/
/bin/
.idea
crowdin.yaml
public/uploads/*.tif
public/uploads/assets/*
public/uploads/avatars/*
public/uploads/logo.gif
public/uploads/logo.svg
public/uploads/logo.png
.couscous
public/uploads/logo.svg
public/uploads/models/*
public/uploads/suppliers/*
public/uploads/users/*
storage/app/private_uploads/users/*
storage/debugbar/
storage/dumps/*
tests/_data/scenarios
storage/laravel-backups
storage/logs/*
storage/private_uploads/users/*
tests/_data/scenarios
tests/_output/*
tests/_support/_generated/*

17
app/Http/Controllers/CategoriesController.php
View file

@ -1,6 +1,7 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Helpers\Helper;
use App\Models\Category as Category;
use App\Models\Company;
@ -133,7 +134,7 @@ class CategoriesController extends Controller
* @since [v1.0]
* @return Redirect
*/
public function postEdit($categoryId = null)
public function postEdit(Request $request, $categoryId = null)
{
// Check if the blog post exists
if (is_null($category = Category::find($categoryId))) {
@ -142,12 +143,14 @@ class CategoriesController extends Controller
}
// Update the category data
$category->name = e(Input::get('name'));
$category->category_type = e(Input::get('category_type'));
$category->eula_text = e(Input::get('eula_text'));
$category->use_default_eula = e(Input::get('use_default_eula', '0'));
$category->require_acceptance = e(Input::get('require_acceptance', '0'));
$category->checkin_email = e(Input::get('checkin_email', '0'));
$category->name = e($request->input('name'));
// If the item count is > 0, we disable the category type in the edit. Disabled items
// don't POST, so if the category_type is blank we just set it to the default.
$category->category_type = e($request->input('category_type', $category->category_type));
$category->eula_text = e($request->input('eula_text'));
$category->use_default_eula = e($request->input('use_default_eula', '0'));
$category->require_acceptance = e($request->input('require_acceptance', '0'));
$category->checkin_email = e($request->input('checkin_email', '0'));
if ($category->save()) {
// Redirect to the new category page

2
config/version.php
View file

@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v3.0',
'hash_version' => 'v3.0-32-gba25972',
'hash_version' => 'v3.0-55-g3fd5fb8',
);

1643
public/assets/js/extensions/export/tableExport.js
View file

File diff suppressed because it is too large Load diff

1
public/uploads/.gitignore vendored Executable file
View file

@ -0,0 +1 @@
!.gitignore

1
public/uploads/assets/.gitignore vendored Executable file
View file

@ -0,0 +1 @@
!.gitignore

1
public/uploads/avatars/.gitignore vendored Executable file
View file

@ -0,0 +1 @@
!.gitignore

1
public/uploads/models/.gitignore vendored Executable file
View file

@ -0,0 +1 @@
!.gitignore

1
public/uploads/suppliers/.gitignore vendored Executable file
View file

@ -0,0 +1 @@
!.gitignore

3
resources/views/accessories/index.blade.php
View file

@ -75,6 +75,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'accessories-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

3
resources/views/asset_maintenances/index.blade.php
View file

@ -80,6 +80,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'maintenances-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

3
resources/views/categories/index.blade.php
View file

@ -77,6 +77,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'categories-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

3
resources/views/components/index.blade.php
View file

@ -96,6 +96,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'components-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

3
resources/views/consumables/index.blade.php
View file

@ -80,6 +80,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'consumables-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

3
resources/views/depreciations/index.blade.php
View file

@ -75,6 +75,9 @@ $('#table').bootstrapTable({
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'depreciations-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

3
resources/views/groups/index.blade.php
View file

@ -70,6 +70,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'groups-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

3
resources/views/hardware/index.blade.php
View file

@ -161,6 +161,9 @@
paginationPreText: "{{ trans('general.previous') }}",
paginationNextText: "{{ trans('general.next') }}",
pageList: ['10','25','50','100','150','200','500','1000'],
exportOptions: {
fileName: 'assets-export-' + (new Date()).toISOString().slice(0,10),
},
icons: {
paginationSwitchDown: 'fa-caret-square-o-down',
paginationSwitchUp: 'fa-caret-square-o-up',

4
resources/views/hardware/view.blade.php
View file

@ -247,7 +247,7 @@
@endif
<tr>
<td>{{ trans('admin/hardware/form.notes') }}</td>
<td>{{ $asset->notes }}</td>
<td> {!! nl2br(e($asset->notes)) !!}</td>
</tr>
@if ($asset->created_at)
<tr>
@ -514,7 +514,7 @@
<td></td>
<td>
<!-- @if ($asset->notes)
{{ $asset->notes }}
{!! nl2br(e($asset->notes)) !!}
@endif -->
</td>
</tr>

3
resources/views/licenses/index.blade.php
View file

@ -85,6 +85,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'licenses-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

5
resources/views/locations/index.blade.php
View file

@ -20,7 +20,7 @@
<div class="table-responsive">
<table
name="categories"
name="locations"
class="table table-striped"
id="table"
data-url="{{ route('api.locations.list') }}"
@ -77,6 +77,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'locations-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

3
resources/views/manufacturers/index.blade.php
View file

@ -74,6 +74,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'manufacturers-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

9
resources/views/models/index.blade.php
View file

@ -76,11 +76,16 @@
pagination: true,
sidePagination: 'server',
sortable: true,
mobileResponsive: true,
showExport: true,
cookie: true,
cookieExpire: '2y',
mobileResponsive: true,
showExport: true,
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'models-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

3
resources/views/statuslabels/index.blade.php
View file

@ -72,6 +72,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'statuslabels-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

3
resources/views/suppliers/index.blade.php
View file

@ -75,6 +75,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'suppliers-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

5
resources/views/users/index.blade.php
View file

@ -53,7 +53,7 @@
<table
name="assets"
name="users"
data-toolbar="#toolbar"
class="table table-striped"
id="table"
@ -149,6 +149,9 @@
showColumns: true,
exportDataType: 'all',
exportTypes: ['csv', 'txt','json', 'xml'],
exportOptions: {
fileName: 'users-export-' + (new Date()).toISOString().slice(0,10),
},
maintainSelected: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

2
snipeit.sh
View file

@ -259,7 +259,7 @@ case $distro in
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y lamp-server^ >> /var/log/snipeit-install.log 2>&1
if [ "$version" == "16.04" ]; then
sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-mbstring >> /var/log/snipeit-install.log 2>&1
sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring >> /var/log/snipeit-install.log 2>&1
#Enable mcrypt and rewrite
echo "## Enabling mcrypt and rewrite"
sudo phpenmod mcrypt >> /var/log/snipeit-install.log 2>&1