snipe
da08f0e26f
Merge pull request #13584 from Godmartinz/Bulk_location_edit_fix_gh-13572
...
added an option to bulk edit location & fixed location bug
2023-10-25 20:57:18 +01:00
snipe
ab3edae0b6
Reverted buttons (this re-introduces the n+1 problem.)
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:43:09 +01:00
snipe
887d013a39
Added listable fields in profile -> requested assets
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:42:33 +01:00
snipe
23a6547ada
Added custom fields, fixed n+1
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:28:14 +01:00
snipe
63a86c5622
Added field to controller
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:27:36 +01:00
snipe
933ce61efd
Removed eager loading for defaultLoc, added requests loading, sorting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:26:51 +01:00
snipe
96f7f49b68
Fixed response docblock
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 16:40:49 +01:00
Robert-Azelis
5ae09b791f
Update AssetsTransformer.php
...
on list of assets display EOL rate in months if purchase date and eol date are set, otherwise null (not display anything)
2023-10-22 18:16:49 +02:00
Robert-Azelis
bd195a6911
Update AssetsController.php
...
when asset is updated control EOL date change sand set explicit marker depends to setup of model EOL rate
2023-10-22 18:11:19 +02:00
Robert-Azelis
58062ff9f5
Update AssetModelsController.php
...
if EOL of model has been changed and value is >0 assets will be updates with new EOL rate, date
if EOL of model has been changes and value is null or 0 then assets will be updates by null EOL rate, date
*asset with set expilicity market will not be updated
2023-10-22 17:56:38 +02:00
Robert-Azelis
47186b0abe
[FIX] Custom report - date fields error
...
Custom report in v6.2.3 give Error if selected are fields:
Purchase Date, Checkout Date, Last Checkin Date, Expected Checkin Date
Reason is: date field format
2023-10-22 16:28:44 +02:00
snipe
38066bf162
Merge pull request #13758 from inietov/fixes/array_to_string_conversion_rb17355
...
Fixed ErrorException: Array to String Conversion rb17355
2023-10-18 19:09:13 +01:00
spencerrlongg
38de69b3da
new validation rule
2023-10-18 12:41:24 -05:00
snipe
1be503b21a
Make sure order number is not an array
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:36:16 +01:00
snipe
4d841dbc79
Use custom report validator
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:13:25 +01:00
snipe
f2fb5b43e3
Added custom report validator
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:12:52 +01:00
spencerrlongg
f7bb911b99
clean up
2023-10-17 19:06:53 -05:00
spencerrlongg
388e4c10c4
catch custom fields that are arrays
2023-10-17 19:03:58 -05:00
snipe
3f6554ee34
Use singleton for offset
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-16 23:23:43 +01:00
snipe
a92a9d7616
Removed duplicated deleted
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-13 19:53:11 +01:00
snipe
8f23a45cb3
Removed dummy text
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-13 19:49:03 +01:00
snipe
93cccf4f5f
Handle case where value is deleted in history
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-13 19:32:09 +01:00
Marcus Moore
417f9c21e4
Fix the storing of group permissions when creating via API
2023-10-10 17:51:29 -07:00
snipe
f685ba01b6
Reversed order of find
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:43:14 +01:00
snipe
e3591dc756
Merge pull request #13728 from snipe/fixes/13725_for_dev
...
Fixes qty remaining requirements for component checkout via API
2023-10-09 16:34:40 +01:00
snipe
b9dc7f88d0
Fix qty requirements for Components API checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:32:30 +01:00
snipe
866bbe5e11
Removed extra debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:15:14 +01:00
snipe
6d55d78280
Set resend acceptance to POST
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:13:41 +01:00
snipe
e5f5802235
Added tighter controls for matching log ID and item_id
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 15:17:03 +01:00
snipe
eea2eabaee
Escaping asset history old/new values
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-06 19:45:23 +01:00
snipe
cd3b4754e8
Merge pull request #13704 from Godmartinz/feature/sc-23571_v2
...
Added a check-in button on components tab of Asset view
2023-10-05 14:28:37 +01:00
Godfrey M
c69958d95d
removed dead space
2023-10-03 12:32:24 -07:00
Godfrey M
92776adb93
remove unnecessary changes
2023-10-03 12:31:58 -07:00
Godfrey M
dee36fc294
adds component checkin to asset tab
2023-10-03 12:30:08 -07:00
snipe
129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2
...
Standardize Asset EOL Date
2023-10-02 16:09:22 +01:00
snipe
0184d25a95
Merge pull request #13681 from marcusmoore/bug/sc-23778
...
Fixed uncaught type error when attempting to render barcodes with invalid characters
2023-09-29 01:50:07 +01:00
Marcus Moore
41eccaeae0
Set dummy asset tag to value that is valid for EAN13
2023-09-28 17:31:45 -07:00
Marcus Moore
eb2edb7475
Add more default values for label preview
2023-09-28 13:40:51 -07:00
snipe
c1f545a523
Merge pull request #13679 from Godmartinz/bug/sc-23688
...
Fixed General Webhooks error messaging and validation
2023-09-28 20:24:09 +01:00
Godfrey M
8792d654b6
added translations for messages
2023-09-28 12:15:17 -07:00
Godfrey M
c21586dee5
adds better error messaging
2023-09-28 11:29:46 -07:00
snipe
f16e81e0e8
Merge pull request #13678 from spencerrlongg/bug/sc-23596
...
Fieldset Properly Sortable in Asset Models Table
2023-09-28 19:24:04 +01:00
spencerrlongg
a54fab5c33
add fieldset to allowed_columns
2023-09-28 13:02:12 -05:00
spencerrlongg
4d67c72eea
scope and switch case in api
2023-09-28 12:26:23 -05:00
snipe
6fa0d42bc2
Fixed bug where license checkout/checkin notes were not being saved
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 15:40:18 +01:00
snipe
492fb15036
Fixed #13670 - order number missing from license import
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 14:24:07 +01:00
snipe
ee72c92d4f
Fix for asset history with enfrypted fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 03:00:49 +01:00
Marcus Moore
a47e36c1e5
Add custom fields as options
2023-09-27 16:51:53 -07:00
snipe
660abeca9e
Merge pull request #13638 from marcusmoore/bug/sc-20704
...
Fixed exception being thrown when selected import was deleted
2023-09-26 15:00:35 +01:00
snipe
279e6c7e4f
Check for null company ID
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-26 14:33:42 +01:00
Marcus Moore
5a88a64ebd
Remove unnecessary redirect
2023-09-20 17:35:34 -07:00
Marcus Moore
b1199100a0
Display error message if import file deleted before it can be selected
2023-09-20 17:22:12 -07:00
Godfrey M
b7901ae2d8
dont allow redirects, messaging applied, general webhook validation applied
2023-09-20 12:54:34 -07:00
spencerrlongg
4660a2e5b7
rm more duplicate
2023-09-20 14:37:32 -05:00
spencerrlongg
a9123754f5
remove unnecessary code
2023-09-20 14:34:42 -05:00
spencerrlongg
7dab59c98d
fix for no eol, fix for optional in view
2023-09-20 14:17:30 -05:00
Godfrey M
66abf8d5c0
redoing logic
2023-09-19 17:46:29 -07:00
spencerrlongg
d65d1930e4
asset models
2023-09-19 19:24:53 -05:00
spencerrlongg
1cfd7673e0
change Importer.php back
2023-09-14 16:11:24 -05:00
snipe
2166d6649d
Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled
...
Fixed #13336 - Save unhashed password if no password provided
2023-09-14 14:15:53 +01:00
snipe
d916e20c10
Merge pull request #13415 from marcusmoore/feature/department-scoping
...
Added `CompanyableTrait` to `Department` model
2023-09-14 12:52:53 +01:00
snipe
b92327eb40
Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature
...
Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]
2023-09-14 12:52:13 +01:00
spencerrlongg
951521dc81
push
2023-09-13 15:20:55 -05:00
spencerrlongg
70a251de55
fix up gui edit
2023-09-13 13:51:14 -05:00
spencerrlongg
e21a8b6717
fix up this file
2023-09-12 18:11:36 -05:00
Ivan Nieto Vivanco
9cbd2d032c
Add a boolean variable and condition to handle the call to checkedOutToUser() method
2023-09-11 17:40:59 -06:00
spencerrlongg
3e3bb594ea
some import stuff
2023-09-11 17:34:04 -05:00
slong753
27bea2abb9
just some more wip on the importer
2023-09-11 17:21:51 -05:00
slong753
78c400e948
fix conflicts
2023-09-11 17:21:50 -05:00
slong753
75d7e3e1a0
fix conflicts
2023-09-11 17:20:21 -05:00
slong753
5948679a4a
fix purchase date update
2023-09-11 17:17:59 -05:00
slong753
774f21bb7f
some more cleanup
2023-09-11 17:17:59 -05:00
slong753
cda9dd57dd
asset update logic
2023-09-11 17:15:25 -05:00
slong753
1ea0de8bca
prevent injection, fix asset update
2023-09-11 17:15:25 -05:00
slong753
17ccfa9ada
resolve some conflicts
2023-09-11 17:15:24 -05:00
slong753
c1daabef08
progress
2023-09-11 17:10:41 -05:00
Godfrey M
e73b16846e
adds an option to bulk edit actual location for bulk edit and fixes update issue
2023-09-11 11:21:56 -07:00
Godfrey Martinez
a26b96185b
Merge branch 'develop' into asset-model-notifs
2023-09-11 09:37:22 -07:00
Godfrey M
0eb50ceb3d
removes commented code
2023-09-11 09:36:38 -07:00
snipe
06836663c8
Merge pull request #13575 from marcusmoore/fixes/improve-api-messaging
...
Added validation around department_id in API patch request
2023-09-07 21:36:20 +01:00
Marcus Moore
4caa501996
Relax property type check
2023-09-07 13:28:32 -07:00
snipe
02c187b0a0
Merge pull request #13566 from snipe/features/13562_add_inline_file_link
...
Fixed #13562 - Added inline file link
2023-09-07 20:50:13 +01:00
Ivan Nieto Vivanco
abd2ed3b81
Filter unaccepted assets that are not assigned to users
2023-09-07 13:39:16 -06:00
Marcus Moore
899c2eb19b
Implement test case
2023-09-07 12:34:50 -07:00
snipe
894c34ff4f
Update to only use relative paths
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-07 20:22:14 +01:00
snipe
a67888f3d3
Merge pull request #13547 from inietov/fixes/Attempt_to_read_property_asset_tag
...
Fixed ErrorException: Attempt to read property "asset_tag" on null (rollbar #3541 )
2023-09-05 20:26:21 +01:00
Ivan Nieto Vivanco
91b1cc7121
Move the early return to the controller instead of the Label model
2023-09-05 13:23:51 -06:00
snipe
d6dd332b09
Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog
...
Added/Fixed: track changes on asset checkin/out
2023-09-05 19:08:49 +01:00
snipe
f53db8ba75
Fixed #13562 - allow inline view for uploaded files
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-05 18:28:01 +01:00
snipe
e486fe2794
Removed soft-delete query
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-05 16:10:20 +01:00
snipe
f85df6bb8c
Use same method of accessing companies as others
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-05 16:02:28 +01:00
snipe
2acf2b880e
Account for hard-deleted models, suppliers
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-05 15:58:21 +01:00
snipe
a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report
...
Added last check in column and filter to custom asset report
2023-09-05 13:22:15 +01:00
Johnson Yi
09f7b3debe
Track changes on asset checkin/out
2023-09-01 13:12:07 +10:00
snipe
c51574099f
Merge pull request #13507 from Godmartinz/ignore_encrypt_and_other_changes
...
Added eager loading for `changedinfo` and removed encrypted values from Asset history
2023-08-31 13:04:39 +01:00
snipe
b109ee281a
Merge pull request #13544 from marcusmoore/bug/sc-23675
...
Fixed user search not adhering to company scoping
2023-08-30 08:54:41 +01:00
Marcus Moore
806ab2cb9d
Ensure users are scoped by company in index method
2023-08-29 16:17:29 -07:00
Godfrey Martinez
d86c63cf23
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable
2023-08-28 19:38:16 -07:00
Godfrey M
74f45a4473
reworks company queries for asset history
2023-08-28 19:35:46 -07:00
Ivan Nieto Vivanco
4e4ba38038
Pass the model_id variable in the controller and get it only if we are cloning the asset model
2023-08-28 16:23:26 -06:00
snipe
baffcbad71
Set password property properly
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-28 20:47:56 +01:00
snipe
611db4c0d2
Removed stray line
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-28 20:46:45 +01:00
Godfrey Martinez
92e88a0ae2
Merge branch 'develop' into ignore_encrypt_and_other_changes
2023-08-28 10:14:41 -07:00
Godfrey M
18cb514a53
revert unwanted changes
2023-08-24 10:40:44 -07:00
Godfrey M
a3b6e0fbe6
adds some spacing
2023-08-24 10:36:09 -07:00
Godfrey M
34ba0c4440
adds id to history info
2023-08-24 10:36:08 -07:00
Godfrey M
739fc152c2
Adds readable asset history in the action log transformer
2023-08-24 10:36:08 -07:00
Godfrey M
8ebb9afedd
adds min_amt to asset model edit, index, and table
2023-08-24 10:30:07 -07:00
Marcus Moore
e32c07be02
Clear commented log statements
2023-08-24 08:15:40 -07:00
Marcus Moore
5a0b0522b0
Explicitly declare $clean_meta variable
2023-08-24 08:15:07 -07:00
Ivan Nieto Vivanco
6161a0d76d
Add condition in LicenseCheckinController:bulkCheckin method to evaluate if the license is reassignable
2023-08-23 16:22:40 -06:00
Godfrey Martinez
28cf533d19
Merge branch 'develop' into ignore_encrypt_and_other_changes
2023-08-23 00:42:59 -07:00
Godfrey M
0fc79ec936
fixes conflicts
2023-08-23 00:40:59 -07:00
Godfrey M
ffe1b11419
merged develop
2023-08-23 00:38:58 -07:00
Godfrey M
27488c1009
adds soft deletes to eager loading
2023-08-23 00:34:09 -07:00
Godfrey M
ce60db009c
adds soft deletes to eager loading
2023-08-23 00:32:43 -07:00
Marcus Moore
bee680683d
Add withTrashed to asset model query
2023-08-22 17:05:06 -07:00
Godfrey M
92ddf8fc67
removed dead space
2023-08-22 12:38:50 -07:00
Godfrey M
1019287c76
retarget key
2023-08-22 12:36:43 -07:00
Godfrey M
9e438c3ed0
eager loaded changedInfo queries, reworked encrypted data change log changes
2023-08-22 12:34:45 -07:00
Godfrey M
c7f2acf2c6
removes encrypted info from change log, renames asset_eol_date in the change log
2023-08-22 11:39:38 -07:00
snipe
79b330f492
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error
...
Fixed Asset acceptance error when user company and asset company don't match
2023-08-22 15:49:56 +01:00
snipe
a48762c64d
Merge pull request #13496 from snipe/features/setting_for_name_order
...
Fixed #13495 added setting for name order
2023-08-22 12:50:58 +01:00
snipe
aafb7668f5
Merge pull request #13453 from inietov/fixes/accessories_declined_issue
...
Fixed #13317 Accessories declined by user remain assigned
2023-08-22 12:42:55 +01:00
snipe
fea11ec7f1
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields
...
Bulk Editing Custom Fields
2023-08-22 12:40:18 +01:00
snipe
303b45c9e9
Merge pull request #13485 from Godmartinz/history_info_clean_up
...
Added better handling of information of asset history
2023-08-22 12:25:17 +01:00
Marcus Moore
4e2ef4f056
Default to using the current date if last check in end date is not provided
2023-08-21 14:35:15 -07:00
Marcus Moore
c332b98456
Add last checkin options to report front end
2023-08-21 13:44:49 -07:00
Godfrey M
b54aaefefb
adds some spacing
2023-08-21 13:43:06 -07:00
Godfrey M
5076b45a0d
adds id to history info
2023-08-21 13:40:39 -07:00
snipe
f3460b5a4f
Switch to getFullNameAttribute() in user transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-21 20:10:48 +01:00
snipe
474c03e3fc
Added name order to settings save controller method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-21 20:10:03 +01:00
Marcus Moore
489d30c685
Set last_checkin in ui and api controllers
2023-08-21 11:57:33 -07:00
snipe
ffc7c4e99a
use number format to constrain large number displays
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-18 22:18:09 +01:00
snipe
1e82c2bfad
Changed example asset name
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-18 22:17:54 +01:00
snipe
da2f22d504
Fixed #13487 - include supplier url in listing
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-18 15:31:15 +01:00
Godfrey M
a62876d4bc
Adds readable asset history in the action log transformer
2023-08-17 16:14:01 -07:00
snipe
34f2221b02
Merge pull request #13471 from inietov/fixes/components_search
...
Fixed #13409 Search in component detail view not working
2023-08-16 21:59:40 +01:00
Brady Wetherington
852e9ff311
Accessory checkin via API reported wrong target user
2023-08-16 13:03:37 +01:00
Ivan Nieto Vivanco
92df32dfaa
Move a couple assignation of variables inside an else to only execute once
2023-08-15 21:10:48 -06:00
Ivan Nieto Vivanco
993918f47c
Add query to search into the per-component view
2023-08-15 15:31:36 -06:00
snipe
01ab360ef3
Fixed accessory clone typo
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 20:39:09 +01:00
snipe
64342838fd
Return the user to the labels page on save
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 18:48:12 +01:00
snipe
e41368daac
Merge pull request #12050 from cram42/develop
...
New Label Engine
2023-08-15 17:58:57 +01:00
snipe
c56f664811
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies
...
Add email to companies
2023-08-15 13:26:20 +01:00
snipe
12e9d2adeb
Fixed #13450 - remove escaping on saveing new custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-14 22:21:41 +01:00
Ivan Nieto Vivanco
8da2a8a79c
Allows to save signature for declined items
2023-08-14 14:58:10 -06:00
Robert-Azelis
8988a5dfc3
Update CompaniesTransformer.php
2023-08-13 17:20:15 +02:00
Robert-Azelis
ed5b4ca0a2
Update CompaniesController.php
2023-08-13 17:18:25 +02:00
Robert-Azelis
07bafa9508
Update CompaniesController.php
2023-08-13 17:15:20 +02:00