DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-23 01:07:42 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-10-30 21:05:33 +00:00
parent a8e8fe7447 518c43680d
commit 5236ca3332
10 changed files with 66 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Importer/AccessoryImporter.php
View file

@ -34,7 +34,7 @@ class AccessoryImporter extends ItemImporter
} }
$this->log('Updating Accessory'); $this->log('Updating Accessory');
$this->item['model_number'] = $this->findCsvMatch($row, "model_number"); $this->item['model_number'] = trim($this->findCsvMatch($row, "model_number"));
$accessory->update($this->sanitizeItemForUpdating($accessory)); $accessory->update($this->sanitizeItemForUpdating($accessory));
$accessory->save(); $accessory->save();

10
app/Importer/AssetImporter.php
View file

@ -83,13 +83,13 @@ class AssetImporter extends ItemImporter
$this->log('No Matching Asset, Creating a new one'); $this->log('No Matching Asset, Creating a new one');
$asset = new Asset; $asset = new Asset;
} }
$this->item['notes'] = $this->findCsvMatch($row, 'asset_notes'); $this->item['notes'] = trim($this->findCsvMatch($row, 'asset_notes'));
$this->item['image'] = $this->findCsvMatch($row, 'image'); $this->item['image'] = trim($this->findCsvMatch($row, 'image'));
$this->item['requestable'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable')) == 1) ? '1' : 0; $this->item['requestable'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable'))) == 1) ? '1' : 0;
$asset->requestable = $this->item['requestable']; $asset->requestable = $this->item['requestable'];
$this->item['warranty_months'] = intval($this->findCsvMatch($row, 'warranty_months')); $this->item['warranty_months'] = intval(trim($this->findCsvMatch($row, 'warranty_months')));
$this->item['model_id'] = $this->createOrFetchAssetModel($row); $this->item['model_id'] = $this->createOrFetchAssetModel($row);
$this->item['byod'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'byod')) == 1) ? '1' : 0; $this->item['byod'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'byod'))) == 1) ? '1' : 0;
// If no status ID is found // If no status ID is found

4
app/Importer/ComponentImporter.php
View file

@ -28,8 +28,8 @@ class ComponentImporter extends ItemImporter
{ {
$component = null; $component = null;
$this->log('Creating Component'); $this->log('Creating Component');
$component = Component::where('name', $this->item['name']) $component = Component::where('name', trim($this->item['name']))
->where('serial', $this->item['serial']) ->where('serial', trim($this->item['serial']))
->first(); ->first();
if ($component) { if ($component) {

8
app/Importer/ConsumableImporter.php
View file

@ -26,7 +26,7 @@ class ConsumableImporter extends ItemImporter
*/ */
public function createConsumableIfNotExists($row) public function createConsumableIfNotExists($row)
{ {
$consumable = Consumable::where('name', $this->item['name'])->first(); $consumable = Consumable::where('name', trim($this->item['name']))->first();
if ($consumable) { if ($consumable) {
if (! $this->updating) { if (! $this->updating) {
$this->log('A matching Consumable '.$this->item['name'].' already exists. '); $this->log('A matching Consumable '.$this->item['name'].' already exists. ');
@ -41,9 +41,9 @@ class ConsumableImporter extends ItemImporter
} }
$this->log('No matching consumable, creating one'); $this->log('No matching consumable, creating one');
$consumable = new Consumable(); $consumable = new Consumable();
$this->item['model_number'] = $this->findCsvMatch($row, 'model_number'); $this->item['model_number'] = trim($this->findCsvMatch($row, 'model_number'));
$this->item['item_no'] = $this->findCsvMatch($row, 'item_number'); $this->item['item_no'] = trim($this->findCsvMatch($row, 'item_number'));
$this->item['min_amt'] = $this->findCsvMatch($row, "min_amt"); $this->item['min_amt'] = trim($this->findCsvMatch($row, "min_amt"));
$consumable->fill($this->sanitizeItemForStoring($consumable)); $consumable->fill($this->sanitizeItemForStoring($consumable));
//FIXME: this disables model validation. Need to find a way to avoid double-logs without breaking everything. //FIXME: this disables model validation. Need to find a way to avoid double-logs without breaking everything.
$consumable->unsetEventDispatcher(); $consumable->unsetEventDispatcher();

6
app/Importer/ItemImporter.php
View file

@ -372,7 +372,7 @@ class ItemImporter extends Importer
if (empty($asset_statuslabel_name)) { if (empty($asset_statuslabel_name)) {
return null; return null;
} }
$status = Statuslabel::where(['name' => $asset_statuslabel_name])->first(); $status = Statuslabel::where(['name' => trim($asset_statuslabel_name)])->first();
if ($status) { if ($status) {
$this->log('A matching Status '.$asset_statuslabel_name.' already exists'); $this->log('A matching Status '.$asset_statuslabel_name.' already exists');
@ -381,7 +381,7 @@ class ItemImporter extends Importer
} }
$this->log('Creating a new status'); $this->log('Creating a new status');
$status = new Statuslabel(); $status = new Statuslabel();
$status->name = $asset_statuslabel_name; $status->name = trim($asset_statuslabel_name);
$status->deployable = 1; $status->deployable = 1;
$status->pending = 0; $status->pending = 0;
@ -420,7 +420,7 @@ class ItemImporter extends Importer
//Otherwise create a manufacturer. //Otherwise create a manufacturer.
$manufacturer = new Manufacturer(); $manufacturer = new Manufacturer();
$manufacturer->name = $item_manufacturer; $manufacturer->name = trim($item_manufacturer);
$manufacturer->user_id = $this->user_id; $manufacturer->user_id = $this->user_id;
if ($manufacturer->save()) { if ($manufacturer->save()) {

18
app/Importer/LicenseImporter.php
View file

@ -55,19 +55,19 @@ class LicenseImporter extends ItemImporter
$this->log('No Matching License, Creating a new one'); $this->log('No Matching License, Creating a new one');
$license = new License; $license = new License;
} }
$asset_tag = $this->item['asset_tag'] = $this->findCsvMatch($row, 'asset_tag'); // used for checkout out to an asset. $asset_tag = $this->item['asset_tag'] = trim($this->findCsvMatch($row, 'asset_tag')); // used for checkout out to an asset.
$this->item["expiration_date"] = null; $this->item["expiration_date"] = null;
if ($this->findCsvMatch($row, "expiration_date")!='') { if ($this->findCsvMatch($row, "expiration_date")!='') {
$this->item["expiration_date"] = date("Y-m-d 00:00:01", strtotime($this->findCsvMatch($row, "expiration_date"))); $this->item["expiration_date"] = date("Y-m-d 00:00:01", strtotime(trim($this->findCsvMatch($row, "expiration_date"))));
} }
$this->item['license_email'] = $this->findCsvMatch($row, 'license_email'); $this->item['license_email'] = trim($this->findCsvMatch($row, 'license_email'));
$this->item['license_name'] = $this->findCsvMatch($row, 'license_name'); $this->item['license_name'] = trim($this->findCsvMatch($row, 'license_name'));
$this->item['maintained'] = $this->findCsvMatch($row, 'maintained'); $this->item['maintained'] = trim($this->findCsvMatch($row, 'maintained'));
$this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order'); $this->item['purchase_order'] = trim($this->findCsvMatch($row, 'purchase_order'));
$this->item['order_number'] = $this->findCsvMatch($row, 'order_number'); $this->item['order_number'] = trim($this->findCsvMatch($row, 'order_number'));
$this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable'); $this->item['reassignable'] = trim($this->findCsvMatch($row, 'reassignable'));
$this->item['manufacturer'] = $this->createOrFetchManufacturer($this->findCsvMatch($row, 'manufacturer')); $this->item['manufacturer'] = $this->createOrFetchManufacturer(trim($this->findCsvMatch($row, 'manufacturer')));
if($this->item['reassignable'] == "") if($this->item['reassignable'] == "")
{ {

24
app/Importer/LocationImporter.php
View file

@ -53,21 +53,21 @@ class LocationImporter extends ItemImporter
} }
// Pull the records from the CSV to determine their values // Pull the records from the CSV to determine their values
$this->item['name'] = $this->findCsvMatch($row, 'name'); $this->item['name'] = trim($this->findCsvMatch($row, 'name'));
$this->item['address'] = $this->findCsvMatch($row, 'address'); $this->item['address'] = trim($this->findCsvMatch($row, 'address'));
$this->item['address2'] = $this->findCsvMatch($row, 'address2'); $this->item['address2'] = trim($this->findCsvMatch($row, 'address2'));
$this->item['city'] = $this->findCsvMatch($row, 'city'); $this->item['city'] = trim($this->findCsvMatch($row, 'city'));
$this->item['state'] = $this->findCsvMatch($row, 'state'); $this->item['state'] = trim($this->findCsvMatch($row, 'state'));
$this->item['country'] = $this->findCsvMatch($row, 'country'); $this->item['country'] = trim($this->findCsvMatch($row, 'country'));
$this->item['zip'] = $this->findCsvMatch($row, 'zip'); $this->item['zip'] = trim($this->findCsvMatch($row, 'zip'));
$this->item['currency'] = $this->findCsvMatch($row, 'currency'); $this->item['currency'] = trim($this->findCsvMatch($row, 'currency'));
$this->item['ldap_ou'] = $this->findCsvMatch($row, 'ldap_ou'); $this->item['ldap_ou'] = trim($this->findCsvMatch($row, 'ldap_ou'));
$this->item['manager'] = $this->findCsvMatch($row, 'manager'); $this->item['manager'] = trim($this->findCsvMatch($row, 'manager'));
$this->item['manager_username'] = $this->findCsvMatch($row, 'manager_username'); $this->item['manager_username'] = trim($this->findCsvMatch($row, 'manager_username'));
$this->item['user_id'] = \Auth::user()->id; $this->item['user_id'] = \Auth::user()->id;
if ($this->findCsvMatch($row, 'parent_location')) { if ($this->findCsvMatch($row, 'parent_location')) {
$this->item['parent_id'] = $this->createOrFetchLocation($this->findCsvMatch($row, 'parent_location')); $this->item['parent_id'] = $this->createOrFetchLocation(trim($this->findCsvMatch($row, 'parent_location')));
} }
if (!empty($this->item['manager'])) { if (!empty($this->item['manager'])) {

48
app/Importer/UserImporter.php
View file

@ -42,32 +42,32 @@ class UserImporter extends ItemImporter
public function createUserIfNotExists(array $row) public function createUserIfNotExists(array $row)
{ {
// Pull the records from the CSV to determine their values // Pull the records from the CSV to determine their values
$this->item['id'] = $this->findCsvMatch($row, 'id'); $this->item['id'] = trim($this->findCsvMatch($row, 'id'));
$this->item['username'] = $this->findCsvMatch($row, 'username'); $this->item['username'] = trim($this->findCsvMatch($row, 'username'));
$this->item['first_name'] = $this->findCsvMatch($row, 'first_name'); $this->item['first_name'] = trim($this->findCsvMatch($row, 'first_name'));
$this->item['last_name'] = $this->findCsvMatch($row, 'last_name'); $this->item['last_name'] = trim($this->findCsvMatch($row, 'last_name'));
$this->item['email'] = $this->findCsvMatch($row, 'email'); $this->item['email'] = trim($this->findCsvMatch($row, 'email'));
$this->item['gravatar'] = $this->findCsvMatch($row, 'gravatar'); $this->item['gravatar'] = trim($this->findCsvMatch($row, 'gravatar'));
$this->item['phone'] = $this->findCsvMatch($row, 'phone_number'); $this->item['phone'] = trim($this->findCsvMatch($row, 'phone_number'));
$this->item['website'] = $this->findCsvMatch($row, 'website'); $this->item['website'] = trim($this->findCsvMatch($row, 'website'));
$this->item['jobtitle'] = $this->findCsvMatch($row, 'jobtitle'); $this->item['jobtitle'] = trim($this->findCsvMatch($row, 'jobtitle'));
$this->item['address'] = $this->findCsvMatch($row, 'address'); $this->item['address'] = trim($this->findCsvMatch($row, 'address'));
$this->item['city'] = $this->findCsvMatch($row, 'city'); $this->item['city'] = trim($this->findCsvMatch($row, 'city'));
$this->item['state'] = $this->findCsvMatch($row, 'state'); $this->item['state'] = trim($this->findCsvMatch($row, 'state'));
$this->item['country'] = $this->findCsvMatch($row, 'country'); $this->item['country'] = trim($this->findCsvMatch($row, 'country'));
$this->item['start_date'] = $this->findCsvMatch($row, 'start_date'); $this->item['start_date'] = trim($this->findCsvMatch($row, 'start_date'));
$this->item['end_date'] = $this->findCsvMatch($row, 'end_date'); $this->item['end_date'] = trim($this->findCsvMatch($row, 'end_date'));
$this->item['zip'] = $this->findCsvMatch($row, 'zip'); $this->item['zip'] = trim($this->findCsvMatch($row, 'zip'));
$this->item['activated'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0; $this->item['activated'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'activated'))) == 1) ? '1' : 0;
$this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num'); $this->item['employee_num'] = trim($this->findCsvMatch($row, 'employee_num'));
$this->item['department_id'] = $this->createOrFetchDepartment($this->findCsvMatch($row, 'department')); $this->item['department_id'] = trim($this->createOrFetchDepartment(trim($this->findCsvMatch($row, 'department'))));
$this->item['manager_id'] = $this->fetchManager($this->findCsvMatch($row, 'manager_first_name'), $this->findCsvMatch($row, 'manager_last_name')); $this->item['manager_id'] = $this->fetchManager(trim($this->findCsvMatch($row, 'manager_first_name'), $this->findCsvMatch($row, 'manager_last_name')));
$this->item['remote'] =($this->fetchHumanBoolean($this->findCsvMatch($row, 'remote')) ==1 ) ? '1' : 0; $this->item['remote'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'remote'))) == 1 ) ? '1' : 0;
$this->item['vip'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'vip')) ==1 ) ? '1' : 0; $this->item['vip'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'vip'))) ==1 ) ? '1' : 0;
$this->item['autoassign_licenses'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'autoassign_licenses')) ==1 ) ? '1' : 0; $this->item['autoassign_licenses'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'autoassign_licenses'))) ==1 ) ? '1' : 0;
$user_department = $this->findCsvMatch($row, 'department'); $user_department = trim($this->findCsvMatch($row, 'department'));
if ($this->shouldUpdateField($user_department)) { if ($this->shouldUpdateField($user_department)) {
$this->item['department_id'] = $this->createOrFetchDepartment($user_department); $this->item['department_id'] = $this->createOrFetchDepartment($user_department);
} }

1
resources/lang/en/admin/users/message.php
View file

@ -8,6 +8,7 @@ return array(
'user_exists' => 'User already exists!', 'user_exists' => 'User already exists!',
'user_not_found' => 'User does not exist.', 'user_not_found' => 'User does not exist.',
'user_login_required' => 'The login field is required', 'user_login_required' => 'The login field is required',
'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
'user_password_required' => 'The password is required.', 'user_password_required' => 'The password is required.',
'insufficient_permissions' => 'Insufficient Permissions.', 'insufficient_permissions' => 'Insufficient Permissions.',
'user_deleted_warning' => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.', 'user_deleted_warning' => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',

5
routes/web.php
View file

@ -224,6 +224,11 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser
[SettingsController::class, 'postUploadBackup'] [SettingsController::class, 'postUploadBackup']
)->name('settings.backups.upload'); )->name('settings.backups.upload');
// Handle redirect from after POST request from backup restore
Route::get('/restore/{filename?}', function () {
return redirect(route('settings.backups.index'));
});
Route::get('/', [SettingsController::class, 'getBackups'])->name('settings.backups.index'); Route::get('/', [SettingsController::class, 'getBackups'])->name('settings.backups.index');
}); });