snipe
e2d0136336
Fixed goofy translation
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:14:44 +00:00
snipe
6a3ab526de
Refactorer API controller restore methods
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:04:24 +00:00
snipe
19877244cd
Added/refactorerd isDeletable()
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:03:26 +00:00
snipe
f7ccef16e7
Refactorer controller restore methods
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:02:47 +00:00
snipe
2353c8199c
Set qty mutators
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 15:25:22 +00:00
snipe
0d29ac9856
Fixded gate return
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 13:48:20 +00:00
snipe
a08dcbdfdb
Quick revert for #13830
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 12:25:42 +00:00
snipe
d6a337a584
English hard
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 11:23:17 +00:00
snipe
83ee07cca1
Created mutator on category checkin_email
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 11:14:04 +00:00
snipe
68ac1aaae0
Additional comments
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-21 15:36:11 +00:00
snipe
6a2ab2cfb2
Removed line break
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-21 15:10:19 +00:00
snipe
590cd0c71f
Added Validator::replace() for friendlier interpretation of validation string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-21 15:03:59 +00:00
snipe
766eee78b2
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-21 13:47:49 +00:00
snipe
2b9e4110bc
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-21 13:37:56 +00:00
snipe
4eb435e148
Use unique_undeleted instead of unique_serial
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-21 12:36:11 +00:00
snipe
b02c60c2ce
Merge pull request #13898 from Azooz2014/develop
...
Fixed #13850 : Too few arguments to function in App\Importer\UserImporter::fetchManager()
2023-11-20 15:41:04 +00:00
snipe
01fec1d6bb
Redirect back to the specific consumable for correction
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-20 15:39:39 +00:00
snipe
7c88601066
Grab the API
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-20 15:31:39 +00:00
snipe
fe2cfa0d38
Redirect if category is missing or invalid
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-20 15:28:44 +00:00
Abdelaziz Faki
2c62a7e78d
Fixing #13850 UserImporter bug
2023-11-19 19:59:01 +03:00
Godfrey Martinez
5569c2ba4a
Merge branch 'develop' into ldap_sync_bug
2023-11-16 10:02:56 -08:00
Godfrey M
2f12a9cfe2
add a conditional around location_id to fix bug
2023-11-16 09:52:44 -08:00
spencerrlongg
b1f75a3bb3
remove unused import
2023-11-15 13:20:17 -06:00
spencerrlongg
c7f90ad86d
tested, working
2023-11-15 12:50:40 -06:00
spencerrlongg
0924a53789
quick fix
2023-11-15 12:28:30 -06:00
snipe
73ebd9017f
Added default map back to the importer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-14 14:37:48 +00:00
snipe
4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769
...
Changed data source input to select in new label engine
2023-11-13 20:38:42 +00:00
snipe
9dc9834bcb
Merge pull request #13859 from inietov/fixes/attempt_to_read_id_on_boolean
...
Fixed ErrorExemption: Attempt to read property "id" on bool [sc-23945]
2023-11-13 20:22:52 +00:00
snipe
4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations
...
Added multi location sync for ldap
2023-11-13 20:20:45 +00:00
snipe
000a28d648
Merge pull request #13830 from spencerrlongg/bug/sc-23921
...
Resolves Exceptions When An Array is Submitted and Exception Occurs Before Validation
2023-11-13 20:19:44 +00:00
snipe
0bae1a1f5e
Merge pull request #13853 from snipe/features/link_back_to_asset_on_create
...
Link back to asset on create
2023-11-13 16:37:35 +00:00
snipe
9e1cfac995
Merge pull request #13857 from akemidx/bug/sc-20532
...
Bug Fix: Undefined array key 266
2023-11-09 09:39:04 +00:00
Ivan Nieto Vivanco
7d30001ff8
Ignore the importer checkout if user is not found
2023-11-08 15:32:33 -06:00
Marcus Moore
49136a4d67
Add tests for color helper
2023-11-08 12:35:42 -08:00
akemidx
4382adce85
typo in error log message
2023-11-08 15:29:29 -05:00
akemidx
2051ac785d
adding in error logging and code comments
2023-11-08 13:44:46 -05:00
akemidx
9cc89911f7
possibilitieeeeeeeeessss
2023-11-08 13:29:32 -05:00
akemidx
495521b70e
adjusting for less than 0 possibility
2023-11-08 12:51:51 -05:00
snipe
ef10f2e50e
Use more correct route in redirect
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-08 14:40:38 +00:00
snipe
08153d418f
Use new alert box and linked string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-08 14:40:18 +00:00
snipe
b3a6cc633b
Merge pull request #13769 from Godmartinz/location-dropdown-duplication
...
clarifies an address column under locations
2023-11-08 08:59:07 +00:00
snipe
bc9545ca96
Merge pull request #13823 from spencerrlongg/chore/sc-23922
...
New Translation Strings for Custom Asset Export
2023-11-08 08:57:20 +00:00
snipe
44d064f094
Merge pull request #13842 from marcusmoore/bug/sc-23932
...
Fixed notes not saving to action log when licenses are checked in/out
2023-11-08 08:53:00 +00:00
snipe
1171141904
Merge pull request #13848 from marcusmoore/bug/sc-23949
...
Fixed missing import
2023-11-08 08:50:31 +00:00
Marcus Moore
eceb69122c
Add missing import
2023-11-07 16:03:28 -08:00
akemidx
154e71de74
shifting wrap around logic back into 0-265
2023-11-07 17:43:51 -05:00
Marcus Moore
a08e0bd547
Ensure notes are saved to the action log when licenses are checked in and out
2023-11-06 12:20:13 -08:00
snipe
7a638e4a65
RB-17457 - Object of class Illuminate\Database\Eloquent\Collection could not be converted to int
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-03 14:06:27 +00:00
Godfrey M
3b6a0d6525
allows multi location sync for ldap
2023-11-02 16:50:19 -07:00
snipe
4d65d09306
Removed trim on manager ID
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-02 14:50:40 +00:00
Godfrey M
13d3f85c62
fixes ldap location sync
2023-11-01 12:26:58 -07:00
spencerrlongg
938ec75aa7
clarifying note
2023-11-01 14:09:03 -05:00
spencerrlongg
c9604b896a
nevermind
2023-11-01 13:46:32 -05:00
spencerrlongg
d167ec6dc0
unique undeleted recreated with laravel rule
2023-11-01 13:36:35 -05:00
spencerrlongg
e05af5216e
formatting
2023-11-01 12:14:46 -05:00
spencerrlongg
3f834cb88f
authorization tested in request
2023-11-01 11:43:53 -05:00
spencerrlongg
d971172cf3
rm unnecessary import
2023-11-01 11:34:15 -05:00
spencerrlongg
53bd5626c9
this works, need to write up pr
2023-11-01 11:33:29 -05:00
spencerrlongg
8f75bb8706
fix translation strings
2023-10-31 21:38:52 -05:00
spencerrlongg
b67b00dd82
this is a start, something up with asset_tag unique rule
2023-10-31 21:06:44 -05:00
spencerrlongg
d4b9f6a2a4
add not_array (not ready, doesn't catch for specific exception)
2023-10-31 21:00:22 -05:00
snipe
f822f8b186
More graceful failure if ldap_results JSON decode isn’t set
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 17:09:18 +00:00
snipe
e381bf978f
Merge pull request #13816 from snipe/bug/sc-23900
...
Fixed datetime displayed on license edit for fields that should be date
2023-10-31 16:59:12 +00:00
snipe
95e9002cd0
Merge pull request #13820 from inietov/fixes/attempt_to_read_property_fields
...
Fixed Attempt to read property fields on null [sc-23903]
2023-10-31 16:30:07 +00:00
Ivan Nieto Vivanco
9f9f8c173b
Add condition to only run trough custom fields if a custom fieldset exist
2023-10-31 10:00:36 -06:00
snipe
57372fc82a
Correctly call the validator in the response if it fails
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 15:30:38 +00:00
snipe
3495652827
Added checkboxes to intentionally remove field values in bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 12:52:53 +00:00
snipe
5779a63221
Undoing that thing I just did :(
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 12:28:57 +00:00
snipe
9fc1cbd7ae
Change cast to include format
...
https://laravel.com/docs/8.x/eloquent-mutators#date-casting - this doesn’t seem to work tho?
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 12:24:48 +00:00
snipe
96211cf73c
Add additional fields to Download All in Activity Report
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 09:43:47 +00:00
snipe
8e20071254
Merge pull request #13731 from snipe/improvements/trim_on_import
...
Added trim to import values
2023-10-30 14:17:37 +00:00
snipe
316c90c144
Update app/Importer/ItemImporter.php
...
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
2023-10-30 14:17:27 +00:00
spencerrlongg
90eb3b86cf
added user phone & address fields
2023-10-26 19:10:53 -05:00
spencerrlongg
f12d44509e
asset_eol_date should always be filled now
2023-10-26 14:39:02 -05:00
spencerrlongg
91b53bffa1
resolved
2023-10-26 14:23:31 -05:00
snipe
aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets
...
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
2023-10-26 15:56:47 +01:00
snipe
7b2f49644e
Use nothing instead of null to make it consistent
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 14:44:17 +01:00
snipe
305cd9b0b8
Use null instead of blank
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 14:42:49 +01:00
snipe
9bba0b764a
Added clearer comments
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 14:38:39 +01:00
snipe
9c90f03142
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 14:34:18 +01:00
snipe
64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements
2023-10-26 13:36:18 +01:00
snipe
7b9259274c
Merge pull request #13799 from inietov/fixes/unlogged_checkin_from_importer
...
Fixed #13795 Unlogged checkin action post updating the username of an asset through the CSV import
2023-10-26 13:33:51 +01:00
snipe
c1213e0abc
Nicer handling for empty custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 09:41:44 +01:00
snipe
05de8a5731
Re-added missing break
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 09:21:27 +01:00
snipe
ff72c4fbaa
Added nicer formatting for fields in log meta
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 09:17:28 +01:00
snipe
c4c47f2e8d
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 06:51:14 +01:00
snipe
0cebccac95
Removed extra logging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 06:51:07 +01:00
snipe
2695576968
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:21:20 +01:00
snipe
f25ddee857
Removed debugging, use new model rules if model has changed
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:21:14 +01:00
snipe
541ba0c0ba
Removed conditional add for model_id
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:20:52 +01:00
snipe
b87879f8e7
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 02:35:53 +01:00
snipe
6ebc01ca50
Bulk edit refactor
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 01:49:23 +01:00
Ivan Nieto Vivanco
ca1845efd7
Only log checkin event if the assigned_to property is not empty
2023-10-25 16:41:31 -06:00
Ivan Nieto Vivanco
7ed58a177b
Evaluate if the asset was assigned to a different user than current target to log a checkin event
2023-10-25 16:31:23 -06:00
snipe
d93e399295
Merge pull request #13797 from Godmartinz/employeeid_search_add
...
adds employee number as a searchable field to the asset table
2023-10-25 21:04:54 +01:00
Godfrey M
1b614c13fb
ugh
2023-10-25 13:03:42 -07:00
Godfrey M
56fd41eee4
removed erroneous code
2023-10-25 13:03:12 -07:00
Godfrey M
33b45898b1
adds to advancedsearch
2023-10-25 12:59:58 -07:00
snipe
7509d57bf6
Merge pull request #13796 from snipe/feature/sc-23880
...
Added optional custom fields to requestable assets page
2023-10-25 20:57:54 +01:00
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
8b9b46c562
Removed comment
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:41:59 +01:00
snipe
307f84dff8
Removed extraneous method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:41:53 +01:00
snipe
e5bd78a722
Added show_in_requestable_list validation, casting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:28:35 +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
08693f09b0
Added requests() method on Assets
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:22:12 +01:00
snipe
96f7f49b68
Fixed response docblock
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 16:40:49 +01:00
snipe
c756849497
Removed debug line
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-24 17:01:51 +01:00
Robert-Azelis
e62636b3a5
Update AssetModelPresenter.php
...
display name 'EOL rate' instead of 'EOL'
2023-10-22 18:27:53 +02:00
Robert-Azelis
4e20a241ce
Update AssetPresenter.php
...
display name 'EOL rate' instead of 'EOL'
2023-10-22 18:26:19 +02:00
Robert-Azelis
30cc498a16
Update AssetObserver.php
...
update exlicit marker depends if model EOL > 0 , EOL = 0
2023-10-22 18:23:30 +02: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
Godfrey M
e0a4387b10
clarifies an address column under locations
2023-10-19 10:01:08 -07: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
Ivan Nieto Vivanco
74ed32903f
Adds condition to check if parameter is of the proper type
2023-10-17 15:48:51 -06:00
snipe
72fe94edb3
Fixed RB-17334 - ErrorException: Undefined variable $user_formatted_array
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-17 22:33:56 +01:00
spencerrlongg
4bdd070f7b
formatting
2023-10-17 13:41:31 -05:00
spencerrlongg
277608d962
this seems to work
2023-10-17 13:30:51 -05:00
snipe
82c2a46ada
Commented out noisy debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-16 23:24:03 +01:00
snipe
3f6554ee34
Use singleton for offset
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-16 23:23:43 +01:00
snipe
23fa92f4ce
Check that the location is valid before debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-16 23:13:38 +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
snipe
2537d0fdaf
Added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-13 12:34:46 +01:00
snipe
c14a01eb8b
Added comments to explain the potential race condition
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-13 12:18:19 +01:00
snipe
138ec33555
Merge pull request #13733 from marcusmoore/bug/sc-23453
...
Fixed notification logic to ensure check in and out emails are delivered
2023-10-11 12:00:37 +01:00
Marcus Moore
417f9c21e4
Fix the storing of group permissions when creating via API
2023-10-10 17:51:29 -07:00
Marcus Moore
43b9e6401c
Formatting
2023-10-10 15:18:55 -07:00
Marcus Moore
dae9e6d096
Improve try catch blocks
2023-10-10 15:18:37 -07:00
Marcus Moore
9ef598d07b
Apply changes to exception handling for check outs to check ins
2023-10-10 15:16:12 -07:00
Marcus Moore
2a29566458
Catch all ClientExceptions on check out
2023-10-10 15:15:02 -07:00
Marcus Moore
ab3a3de59b
Fire webhook notification after sending emails
2023-10-10 15:13:46 -07:00
Marcus Moore
47a77eabf2
Avoid logging error messages for webhook request failures
2023-10-10 15:06:08 -07:00
snipe
758d3aadb4
Added trim to import values
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-10 11:52:35 +01: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
d2dc3253ab
Cast the request limit to intval before we try to abs()
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-07 11:34:37 +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
Marcus Moore
e82fec2a5f
Grammar fix
2023-10-02 16:19:20 -07:00
Marcus Moore
db4c86a4f4
Filter null field options before attempting to process them
2023-10-02 16:14:20 -07:00
Marcus Moore
724c054838
Log non-compliant barcode error as debug message
2023-10-02 12:06:24 -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
bed1055c4e
Catch TypeError when rendering 1d barcode
2023-09-28 17:32:16 -07: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
Marcus Moore
3aa256ec02
Ensure non-checked out items can be displayed
2023-09-28 12:33:20 -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
Marcus Moore
4675f02349
Format assigned to field
2023-09-28 11:35:20 -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
cbef531811
parse purchase date even though it's cast
2023-09-20 14:26:49 -05:00
spencerrlongg
7dab59c98d
fix for no eol, fix for optional in view
2023-09-20 14:17:30 -05:00
spencerrlongg
c48a47936c
add validation back in
2023-09-20 14:00:59 -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
6b4f8f1813
rm duplicate fillable
2023-09-19 18:07:15 -05:00
spencerrlongg
929e107a20
rm byod from casts
2023-09-19 18:04:16 -05:00
snipe
0b562d2f55
Fixes #13609 - disallow sorting on age
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-15 15:25:52 +01: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
dcae5503c8
Use $attributes array
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-14 13:52:57 +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
snipe
c7b24821b3
Merge pull request #13549 from inietov/fixes/attempt_to_read_property_id_on_null
...
Fixed ErrorException: Attempt to read property "id" on null (rollbar #3541 )
2023-09-14 12:50:54 +01:00
spencerrlongg
64a9859efd
cleanup
2023-09-13 17:58:33 -05:00
Ivan Nieto Vivanco
439e031911
Evaluate if the event properties exists before run the CheckoutAcceptance query
2023-09-13 16:35:10 -06:00
spencerrlongg
0368b9df43
viola
2023-09-13 17:16:17 -05:00
spencerrlongg
951521dc81
push
2023-09-13 15:20:55 -05:00
Marcus Moore
11208ee064
Guard against attempting to send notification to model that isn't notifiable
2023-09-13 12:56:27 -07: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
spencerrlongg
7047869367
cleanup
2023-09-12 18:03:13 -05:00
spencerrlongg
53d4fd1d0b
purchase_date
2023-09-12 18:01:33 -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
30dade1fba
cleanup
2023-09-11 17:35:12 -05:00
spencerrlongg
431af5f530
this works!!!!
2023-09-11 17:34:05 -05:00
spencerrlongg
3e3bb594ea
some import stuff
2023-09-11 17:34:04 -05:00
spencerrlongg
fb001caee4
fix conflicts
2023-09-11 17:33:31 -05:00
spencerrlongg
3fb62874f0
quick push to check something else
2023-09-11 17:22:46 -05:00
spencerrlongg
c66804bcee
a little cleanup
2023-09-11 17:22:46 -05:00
slong753
27bea2abb9
just some more wip on the importer
2023-09-11 17:21:51 -05:00
slong753
1b18cd7fe6
added asset_eol_date and explicit to factory
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
20367eecc9
fix conflicts
2023-09-11 17:17:59 -05:00
slong753
cda9dd57dd
asset update logic
2023-09-11 17:15:25 -05:00
slong753
41b65bd9a2
small changes
2023-09-11 17:15:25 -05:00
slong753
17a83129b9
this all needs to be tested tediously
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
slong753
8456b3ec0c
wip stuff
2023-09-11 16:51:40 -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
snipe
7f892bf5ef
Merge pull request #13574 from inietov/fixes/unaccepted_assets_report_incorrect
...
Fixed Unaccepted Assets report has incorrect people [freshdesk-37808]
2023-09-07 20:49:40 +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
Ivan Nieto Vivanco
1509c512a5
Add guard clauses around some License and LicenseSeat models functions
2023-09-06 11:54:11 -06:00
johnson-yi
5897f4d6d9
Add rtd_location_id to tracked changes on checkin actionlog
2023-09-06 00:36:48 +00: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
b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost
...
Added users total cost of assets to user profile
2023-09-05 13:52:34 +01:00