diff --git a/README.md b/README.md index 296c1ff03..f737d050a 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ This project follows the [all-contributors](https://github.com/kentcdodds/all-co ### Contributing -Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing). +Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing-overview). Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php index a821b57ce..dc19f1750 100644 --- a/app/Http/Controllers/Api/GroupsController.php +++ b/app/Http/Controllers/Api/GroupsController.php @@ -73,7 +73,7 @@ class GroupsController extends Controller { $this->authorize('view', Group::class); $group = Group::findOrFail($id); - return $group; + return (new GroupsTransformer)->transformGroup($group); } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php new file mode 100644 index 000000000..364948043 --- /dev/null +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -0,0 +1,15 @@ +middleware('guest'); + } +} diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index cf726eecd..2c863aa6b 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -25,7 +25,7 @@ class ResetPasswordController extends Controller * * @var string */ - protected $redirectTo = '/home'; + protected $redirectTo = '/'; /** * Create a new controller instance. diff --git a/app/Http/Controllers/ComponentsController.php b/app/Http/Controllers/ComponentsController.php index ca09711fd..80d30f2b0 100644 --- a/app/Http/Controllers/ComponentsController.php +++ b/app/Http/Controllers/ComponentsController.php @@ -74,20 +74,20 @@ class ComponentsController extends Controller * @since [v3.0] * @return \Illuminate\Http\RedirectResponse */ - public function store() + public function store(Request $request) { $this->authorize('create', Component::class); $component = new Component(); - $component->name = Input::get('name'); - $component->category_id = Input::get('category_id'); - $component->location_id = Input::get('location_id'); - $component->company_id = Company::getIdForCurrentUser(Input::get('company_id')); - $component->order_number = Input::get('order_number'); - $component->min_amt = Input::get('min_amt'); - $component->serial = Input::get('serial'); - $component->purchase_date = Input::get('purchase_date'); - $component->purchase_cost = request('purchase_cost'); - $component->qty = Input::get('qty'); + $component->name = $request->input('name'); + $component->category_id = $request->input('category_id'); + $component->location_id = $request->input('location_id'); + $component->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $component->order_number = $request->input('order_number', null); + $component->min_amt = $request->input('min_amt', null); + $component->serial = $request->input('serial', null); + $component->purchase_date = $request->input('purchase_date', null); + $component->purchase_cost = $request->input('purchase_cost', null); + $component->qty = $request->input('qty'); $component->user_id = Auth::id(); if ($component->save()) { diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php index 9ff80e5e1..4ec4a90e7 100644 --- a/app/Http/Controllers/CustomFieldsetsController.php +++ b/app/Http/Controllers/CustomFieldsetsController.php @@ -37,19 +37,25 @@ class CustomFieldsetsController extends Controller public function show($id) { $cfset = CustomFieldset::with('fields')->where('id', '=', $id)->orderBy('id', 'ASC')->first(); - $custom_fields_list = ["" => "Add New Field to Fieldset"] + CustomField::pluck("name", "id")->toArray(); - $maxid = 0; - foreach ($cfset->fields() as $field) { - if ($field->pivot->order > $maxid) { - $maxid=$field->pivot->order; - } - if (isset($custom_fields_list[$field->id])) { - unset($custom_fields_list[$field->id]); + if ($cfset) { + $custom_fields_list = ["" => "Add New Field to Fieldset"] + CustomField::pluck("name", "id")->toArray(); + + $maxid = 0; + foreach ($cfset->fields() as $field) { + if ($field->pivot->order > $maxid) { + $maxid=$field->pivot->order; + } + if (isset($custom_fields_list[$field->id])) { + unset($custom_fields_list[$field->id]); + } } + + return view("custom_fields.fieldsets.view")->with("custom_fieldset", $cfset)->with("maxid", $maxid+1)->with("custom_fields_list", $custom_fields_list); } - return view("custom_fields.fieldsets.view")->with("custom_fieldset", $cfset)->with("maxid", $maxid+1)->with("custom_fields_list", $custom_fields_list); + return redirect()->route("fields.index")->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist')); + } @@ -133,16 +139,21 @@ class CustomFieldsetsController extends Controller */ public function destroy($id) { - // $fieldset = CustomFieldset::find($id); - $models = AssetModel::where("fieldset_id", "=", $id); - if ($models->count() == 0) { - $fieldset->delete(); - return redirect()->route("fields.show")->with("success", trans('admin/custom_fields/message.fieldset.delete.success')); - } else { - return redirect()->route("fields.show")->with("error", trans('admin/custom_fields/message.fieldset.delete.in_use')); + if ($fieldset) { + $models = AssetModel::where("fieldset_id", "=", $id); + if ($models->count() == 0) { + $fieldset->delete(); + return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.fieldset.delete.success')); + } else { + return redirect()->route("fields.index")->with("error", trans('admin/custom_fields/message.fieldset.delete.in_use')); + } } + + return redirect()->route("fields.index")->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist')); + + } diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 672c5488f..c406f8371 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -338,7 +338,7 @@ class SettingsController extends Controller $setting->email_format = $request->input('email_format'); $setting->username_format = $request->input('username_format'); $setting->require_accept_signature = $request->input('require_accept_signature'); - if (config('app.lock_passwords')) { + if (!config('app.lock_passwords')) { $setting->login_note = $request->input('login_note'); } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index d6d3b3399..44d6d521b 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -23,6 +23,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\CheckForSetup::class, \Fideloper\Proxy\TrustProxies::class, \App\Http\Middleware\CheckForDebug::class, + \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, ]; /** diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index 6b81ce33c..692ea5eec 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -53,6 +53,7 @@ class ActionlogsTransformer ] : null, 'note' => e($actionlog->note), + 'signature_file' => ($actionlog->accept_signature) ? $actionlog->accept_signature : null, ]; diff --git a/app/Http/Transformers/GroupsTransformer.php b/app/Http/Transformers/GroupsTransformer.php index a40a23bf0..3cec01f99 100644 --- a/app/Http/Transformers/GroupsTransformer.php +++ b/app/Http/Transformers/GroupsTransformer.php @@ -23,7 +23,7 @@ class GroupsTransformer $array = [ 'id' => (int) $group->id, 'name' => e($group->name), - 'permissions' => $group->permissions, + 'permissions' => json_decode($group->permissions), 'users_count' => (int) $group->users_count, 'created_at' => Helper::getFormattedDateObject($group->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($group->updated_at, 'datetime'), diff --git a/app/Models/Component.php b/app/Models/Component.php index 9dcce2f9a..a59448db9 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -53,6 +53,7 @@ class Component extends SnipeModel 'name', 'purchase_cost', 'purchase_date', + 'min_amt', 'qty', ]; diff --git a/app/Models/SnipeModel.php b/app/Models/SnipeModel.php index 43cf0cfc9..e650cb662 100644 --- a/app/Models/SnipeModel.php +++ b/app/Models/SnipeModel.php @@ -77,6 +77,25 @@ class SnipeModel extends Model return; } + public function setMinAmtAttribute($value) + { + if ($value == '') { + $value = null; + } + $this->attributes['min_amt'] = $value; + return; + } + + public function setParentIdAttribute($value) + { + if ($value == '') { + $value = null; + } + $this->attributes['parent_id'] = $value; + return; + } + + // public function getDisplayNameAttribute() { diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 8e734fd45..5fc935056 100755 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -59,7 +59,7 @@
- {{ trans('auth/general.forgot_password') }} + {{ trans('auth/general.forgot_password') }}
diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php index 744b578f7..dc665ea71 100755 --- a/resources/views/groups/index.blade.php +++ b/resources/views/groups/index.blade.php @@ -7,7 +7,8 @@ @stop @section('header_right') - {{ trans('general.create') }} + {{ trans('general.create') }} +{{ trans('general.back') }} @stop @@ -32,7 +33,7 @@ {{ trans('general.id') }} {{ trans('admin/groups/table.name') }} {{ trans('admin/groups/table.users') }} - {{ trans('general.created_at') }} + {{ trans('general.created_at') }} {{ trans('table.actions') }} diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index fcf2c8552..2e8617818 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -603,6 +603,9 @@ {{ trans('general.item') }} {{ trans('general.target') }} {{ trans('general.notes') }} + @if ($snipeSettings->require_accept_signature=='1') + {{ trans('general.signature') }} + @endif diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index e579c666c..672dd39f9 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -358,7 +358,7 @@ $('.snipe-table').bootstrapTable({ function imageFormatter(value, row) { if (value) { - return ''; + return ''; } } diff --git a/resources/views/settings/api.blade.php b/resources/views/settings/api.blade.php index 6de71583e..2d5d7a9dd 100644 --- a/resources/views/settings/api.blade.php +++ b/resources/views/settings/api.blade.php @@ -6,6 +6,10 @@ @parent @stop +@section('header_right') + {{ trans('general.back') }} +@stop + {{-- Page content --}} @section('content') @if (!config('app.lock_passwords'))