snipe
a76a69d085
Fixed incorrect string for location not existing
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-13 20:23:32 +00:00
spencerrlongg
d55358652b
cleanup for pr
2024-02-13 13:45:56 -06:00
snipe
111daffc17
Merge pull request #14188 from spencerrlongg/bug/14146
...
Fixes Default Location Being Set During Asset Creation and Checkout
2024-02-10 11:47:46 +00:00
snipe
3868e711f4
Return null if asset was hard-deleted/purged
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-09 21:08:07 +00:00
snipe
479abd5231
Do not try to return a serial if the item doesn’t exist
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-09 20:53:33 +00:00
snipe
55b3050ca8
Re-applied previous withTrashed PR
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-09 20:37:18 +00:00
snipe
84f8eee869
Revert "Fixed barcodes crashing if asset was deleted"
2024-02-09 20:35:45 +00:00
snipe
fa47707974
Use withTrashed() to get the barcode on deleted assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-09 20:26:49 +00:00
Brady Wetherington
9bb191f29f
Fixes file upload XSS vulnerability [sc-24156]
2024-02-08 14:30:40 +00:00
spencerrlongg
bcfa913450
condition makes this work, needs more testing
2024-02-07 20:03:37 -06:00
spencerrlongg
43d8474caa
a note to remember this tomorrow
2024-02-06 17:45:46 -06:00
snipe
bf674a0f4d
Removed backticks
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-06 15:58:36 +00:00
snipe
b170755c3d
Switch to bulk updating to handle audit interval updates
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-06 15:52:46 +00:00
snipe
a43183ff96
Increased chunk
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-06 09:09:27 +00:00
snipe
b49935701b
Chunk data to reduce memory on large datasets when updating next_audit_date
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 20:48:24 +00:00
snipe
7b4020c5e9
Updated string paths for URL
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 19:09:16 +00:00
snipe
32c360f032
Re-added UI for load_remote
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 18:23:52 +00:00
snipe
1a480435de
Merge pull request #14190 from marcusmoore/bug/sc-24685
...
Fixed consumable checkout via API not sending notification
2024-02-05 17:16:57 +00:00
snipe
650aa25659
Merge pull request #14191 from Godmartinz/googlechat_webhook
...
Added support for Google Chat notifications
2024-02-05 17:10:54 +00:00
snipe
f52b00256d
Merge pull request #14213 from snipe/fixes/orientate_on_exif
...
Fixed FD-40296 - mobile uploads sometimes uploading with incorrect orientation
2024-02-05 16:22:03 +00:00
snipe
5882d71f9b
Fix company asset counts for dashboard widget
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 15:55:53 +00:00
snipe
3b948c7b7e
Add orientate to image upload
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 14:29:43 +00:00
Ivan Nieto Vivanco
5e4a3379a9
Adds Components and Licenses logs to Assets history view
2024-02-01 01:35:25 -06:00
Godfrey M
8a5b469ff8
adds # to webhook channel trigger
2024-01-31 12:54:30 -08:00
Godfrey M
ed06f32a7a
adds # to webhook channel trigger
2024-01-31 12:53:56 -08:00
Godfrey M
a876703f8f
spacing
2024-01-31 10:48:48 -08:00
Godfrey M
01bb8d8c9a
spacing
2024-01-31 10:48:23 -08:00
Godfrey M
f452204d62
applies a conditional to have the the integration test button function properly
2024-01-31 10:47:25 -08:00
Ivan Nieto Vivanco
51ae485f20
When asset is checked-in the assigned licenses also are taken from the user
2024-01-30 19:44:38 -06:00
Marcus Moore
2e0e39ccc8
Ensure notification is sent when consumable is checked out via api
2024-01-30 13:19:20 -08:00
Marcus Moore
13c37e708f
Implement tests around consumable checkout
2024-01-30 12:43:20 -08:00
Godfrey M
87bce0c097
adds google notifs for asset check in and out
2024-01-30 12:38:17 -08:00
spencerrlongg
d0a82adc3f
changed condition
2024-01-29 20:44:26 -06:00
Marcus Moore
42ec2548c9
Fire event when accessory checked out via API
...
Brings behavior in line with GUI controller
2024-01-29 17:03:19 -08:00
Marcus Moore
7d45cfff2c
Ensure accessory available when checking out via api
2024-01-29 16:49:09 -08:00
Brady Wetherington
8a2f3405d5
Merge branch 'develop' into snipeit_v7_laravel10
...
A lot of changes here, but hopefully this works?
2024-01-29 22:12:58 +00:00
Godfrey M
dfa33f651a
webhook test works
2024-01-29 12:58:09 -08:00
Godfrey M
30c2927987
merged develope
2024-01-29 11:21:00 -08:00
Godfrey M
e8159d97fa
changes
2024-01-29 11:12:25 -08:00
spencerrlongg
4cb804cf03
get rid of e()
on store and update
2024-01-26 11:56:02 -06:00
spencerrlongg
2b0dd8851c
probably needs more testing... but should work
2024-01-26 11:47:09 -06:00
snipe
85a158eaef
Merge pull request #14170 from uberbrady/saml_nonce_storage
...
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute [FD-37019]
2024-01-25 20:14:40 +00:00
Brady Wetherington
81b8243e1d
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute
2024-01-25 19:53:24 +00:00
snipe
ab926f2e33
Merge pull request #14153 from Godmartinz/ms_teams_webhook
...
Added support for Microsoft Teams Notifications
2024-01-25 08:27:17 +00:00
Marcus Moore
f5dafc477a
Avoid unnecessary model hydration on asset model show page
2024-01-24 16:14:51 -08:00
Godfrey M
6e9a46e582
working on Chat integration test
2024-01-24 15:50:36 -08:00
Godfrey M
1d3124f89f
adding a test variable for test methods
2024-01-24 14:38:45 -08:00
snipe
105d4899f5
Removed debug line
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 20:33:13 +00:00
Godfrey M
ada1a593a4
add google placeholder
2024-01-24 11:29:32 -08:00
snipe
ba680126bc
Properly sort the results based on non-asset fields
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 19:09:06 +00:00
Godfrey M
00f07ac2ce
add translations, brush up code
2024-01-24 10:38:06 -08:00
snipe
fff21416be
Merge pull request #14051 from akemidx/email_in_license_table
...
Email in License Seat Table
2024-01-24 15:37:43 +00:00
snipe
661cc2b460
Merge pull request #14131 from Godmartinz/label_engine_translations
...
Adds translations for Label example
2024-01-24 13:36:40 +00:00
Godfrey M
ce02e43ab2
fixed integration link, added some conditionals
2024-01-17 16:30:27 -08:00
Godfrey M
9f2af40ef2
adds MS teams integration test
2024-01-17 13:41:45 -08:00
Godfrey M
93ef8317e8
added payload, new MS webhook test method
2024-01-17 11:49:31 -08:00
Marcus Moore
8aa5cf530b
Improve radio button values in custom report form
2024-01-16 12:33:16 -08:00
Godfrey M
74dc17b4b9
adds translations for Label example
2024-01-16 10:47:45 -08:00
snipe
66c24e152f
Merge pull request #14114 from uberbrady/preserve_sort_in_label_generation
...
Fixed [FD-39640]: preserve sort order when generating asset labels
2024-01-11 21:46:01 +00:00
Marcus Moore
423b636db9
Guard against non-integers being passed for company_id
2024-01-09 10:57:43 -08:00
Brady Wetherington
4b90f85372
Fixed [FD-39640]: preserve sort order when generating asset labels
2024-01-09 16:37:33 +00:00
Brady Wetherington
f734e196e5
Merge branch 'develop' into snipeit_v7_laravel10
2024-01-08 18:57:55 +00:00
snipe
2707c399ea
Check that the asset exists before trying to get properties
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-08 12:42:05 +00:00
snipe
f8a21bdb2d
Moved limit and offset to after additional qualifiers
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-05 11:59:31 +00:00
Marcus Moore
742e183b02
Add guard against adding null values to query
...
Since $request->filled(null) returns true
2024-01-04 14:04:00 -08:00
spencerrlongg
901b1b83d0
rm code, was probably fixed through rules at some point
2024-01-02 18:27:17 -06:00
Spencer Long
8546407083
Merge branch 'develop' into refactor/store_asset_form_request
2024-01-02 18:05:15 -06:00
snipe
38bd530fae
Update en defaults for controllers
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-24 19:44:20 +00:00
snipe
a5947b8109
Added warning in middleware
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 20:34:45 +00:00
snipe
db138479aa
Updated locale middleware for mapping
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 17:43:22 +00:00
snipe
f9139e0f10
Changed to use instanceof
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 13:25:32 +00:00
snipe
f13c1a53ef
Get an object instead of a collection
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 12:51:35 +00:00
snipe
f08ce34036
Fixed translation string in JSON
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 12:31:55 +00:00
akemidx
85bfbf8bc4
email in table, shows in export
2023-12-18 20:15:06 -05:00
akemidx
3fe3697a29
adding column, needs table join
2023-12-18 18:26:47 -05:00
snipe
e1d2fdcfb7
Merge pull request #14001 from Godmartinz/feature/sc-18577
...
Added Status Label names to Asset history/ Action log
2023-12-18 22:41:02 +00:00
snipe
444c41bedb
Fixed #14037 - record current time on accessory checkin
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-15 16:39:18 +00:00
snipe
421802893e
Added new fields to action report
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-15 10:45:22 +00:00
snipe
f5f136b9b5
Added fields to history views
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:34:31 +00:00
snipe
a90b04c905
Allowed sorting on user_agent, etc
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:34:08 +00:00
snipe
016ca1adc1
Fixed HTML for checkboxes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-13 06:27:50 +00:00
snipe
b53a4c366e
Removed escaping on notes on checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 13:26:41 +00:00
snipe
e894138fd4
Added $user->created_at to API user create method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 12:26:02 +00:00
snipe
631dd58de1
Added model name and number to quickscan
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 04:23:04 +00:00
snipe
778e45c9fd
Fixed maintenances patch endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-07 19:36:12 +00:00
spencerrlongg
f93e7b91ff
that's all folks
2023-12-06 16:20:30 -06:00
spencerrlongg
18720b3302
safety stuff
2023-12-05 20:36:59 -06:00
spencerrlongg
12e546e63a
everything working, cleanup
2023-12-05 20:22:20 -06:00
spencerrlongg
c28936fefb
almost there... problem with update button
2023-12-05 17:39:35 -06:00
spencerrlongg
080d196138
buttons work now after style tags removed
2023-12-05 16:41:25 -06:00
spencerrlongg
d3967b37cd
this is a start, buttons not working?
2023-12-05 14:52:14 -06:00
Godfrey M
b90cfba796
adds status label id to line change
2023-12-05 11:56:54 -08:00
Godfrey M
49342a4542
added status names to asset history
2023-12-05 11:50:43 -08:00
snipe
0089ea2321
Merge pull request #13882 from marcusmoore/fixes/jquery-validation
...
Fix client side validation in the v7 branch
2023-12-05 17:26:48 +00:00
snipe
3f35124838
Merge pull request #13888 from spencerrlongg/chore/sc-16907
...
Convert Vue Personal Access Tokens to Livewire
2023-12-05 16:45:16 +00:00
spencerrlongg
2d57b9399c
more cleanup
2023-11-30 16:20:48 -06:00
spencerrlongg
6e5f296a13
gets rid of depreciate
2023-11-30 16:08:49 -06:00
spencerrlongg
68d85385a2
get rid of physical
2023-11-30 16:03:30 -06:00
spencerrlongg
88b6a541ee
removed references to archived
2023-11-30 15:59:03 -06:00
spencerrlongg
135b7bde7d
added some more check out assertions
2023-11-30 11:53:26 -06:00
spencerrlongg
d794608a09
note
2023-11-29 15:04:52 -06:00
spencerrlongg
c3492f1699
fixed eol, add calculated eol/eol explicit tests
2023-11-29 14:57:31 -06:00
spencerrlongg
9d8433bd6d
a couple quick things
2023-11-29 13:15:41 -06:00
spencerrlongg
b17078fffd
a couple notes
2023-11-28 22:15:13 -06:00
spencerrlongg
c886fb555b
checkout on store tests almost done
2023-11-28 22:11:20 -06:00
spencerrlongg
15d11f7f4e
test checkout to user on store
2023-11-28 21:46:03 -06:00
spencerrlongg
75ac7f80b9
some refactor + tests
2023-11-28 15:17:46 -06:00
snipe
899890b224
Use update array nomenclature
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 16:25:35 +00:00
snipe
2d4a14d4bb
Fixed from rebase :(
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:55:41 +00:00
snipe
3b9f069627
Switched back to old version
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:54:42 +00:00
snipe
2c6b957fbe
Removed unused query
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:28:37 +00:00
snipe
6ae03a204b
Added the model info back in
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:21:14 +00:00
snipe
c91713e20a
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:14:55 +00:00
snipe
4723cfd4ba
More refactoring
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 13:33:32 +00:00
snipe
f9d5c451bc
Committing this for now - not done
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 13:33:32 +00:00
snipe
5574218966
More FAFO - cleanup needed, but model_id works now
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 13:33:32 +00:00
snipe
c997ae44c2
FAFO troubleshooting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 13:33:32 +00:00
Brady Wetherington
6210716199
Merge branch 'develop' into snipeit_v7_laravel10
2023-11-27 13:04:39 +00:00
snipe
81b2273c37
Refactored checkout screen to redirect if invalid category
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-23 16:18:28 +00:00
snipe
31f429e1c4
Merge pull request #13934 from snipe/fixes/escaped_asset_tag_in_return_msg
...
Escape the asset tag before passing it to the view
2023-11-22 23:21:54 +00:00
snipe
1307ef19cf
Escape the asset tag before passing it to the view
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 23:20:47 +00:00
snipe
aed6b531cb
Derp. Extra return statement
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 23:05:38 +00:00
snipe
ba127be344
Use saveQuietly to prevent double entries
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 23:00:30 +00:00
snipe
45d9119733
Removed debugging/comments
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 22:32:34 +00:00
snipe
8481768c3d
Save quietly for login methods
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 21:42:21 +00:00
snipe
20c0f687e9
Added restored to asset observer, removed manual logging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 20:09:10 +00:00
snipe
d06cfe6502
Changed verb to “restore” from “restored”
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 20:08:41 +00:00
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
f7ccef16e7
Refactorer controller restore methods
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:02:47 +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
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
snipe
e41a16dbf3
Merge pull request #13879 from Godmartinz/location_search_bug
...
added user location scope
2023-11-19 07:01:59 +00:00
spencerrlongg
af3417d6cc
add return type
2023-11-16 11:42:37 -06:00
spencerrlongg
c3e02286d3
i can't blame this on livewire - animations or something?
2023-11-16 11:24:54 -06:00
Spencer Long
19850e8c5a
Merge branch 'snipeit_v7_laravel10' into chore/sc-16907
2023-11-15 20:37:15 -06:00
spencerrlongg
9cf81c7ad4
cleanup, validation
2023-11-15 20:29:14 -06:00
spencerrlongg
6c6417e595
ok, maybe i do like livewire
2023-11-15 20:19:03 -06:00
spencerrlongg
efa8ba5965
nice, just need frontend work now
2023-11-15 17:24:54 -06:00
spencerrlongg
af144a5184
cleanup
2023-11-15 16:55:21 -06:00
spencerrlongg
9b31ae3146
create mostly working
2023-11-15 16:51:09 -06:00
spencerrlongg
eaa68327f7
SINGLE QUOTES
2023-11-15 16:27:01 -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
Marcus Moore
34cd106357
Apply validation
2023-11-14 12:25:18 -08:00
Godfrey M
57019e170f
adds user location scope, still needs fine tuning
2023-11-14 11:49:00 -08:00
spencerrlongg
9f303cc116
playing around with livewire
2023-11-14 11:50:27 -06:00
Brady Wetherington
f64b0d3818
Merge branch 'develop' into snipeit_v7_laravel10
2023-11-14 16:00:29 +00:00
spencerrlongg
fbfc817c5f
just some cleanup
2023-11-13 19:47:03 -06: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
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
spencerrlongg
8e4c0f60a1
return format
2023-11-08 17:36:54 -06:00
spencerrlongg
d68f1e4cfa
initial display work done
2023-11-08 16:48:20 -06: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
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
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
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
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
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
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
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
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
64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements
2023-10-26 13:36:18 +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
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
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
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
Brady Wetherington
db400dffb5
Merge branch 'develop' into snipeit_v7_laravel10
...
Rebuild assets and re-install from npm
2023-10-16 20:13:59 +01:00
snipe
752171d5b8
Use singleton for offset
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-16 20:05:11 +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
Brady Wetherington
7a5714cc85
Merge branch 'develop' into snipeit_v7_laravel10
2023-10-03 20:37:17 +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
Brady Wetherington
c77f5eee8c
Merge branch 'develop' into snipeit_v7_laravel10
2023-09-12 12:04:42 +01: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
Brady Wetherington
ec1059e74c
Merge branch 'develop' into snipeit_v7_laravel10
2023-09-07 20:11:41 +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
Brady Wetherington
3500217f94
Merge branch 'develop' into snipeit_v7_laravel10
2023-08-31 13:07:06 +01: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