snipe
|
f51dd15893
|
Moved deleted scope down
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-14 07:44:19 +01:00 |
|
Marcus Moore
|
346ace9444
|
Allow users that have permission to edit their own location to see locations in select list
|
2023-07-13 17:37:46 -07:00 |
|
Ivan Nieto Vivanco
|
ecac4718fe
|
Add date casting to the SQL query, so the BETWEEN range doesn't care about time of day in custom report datetimes
|
2023-07-13 16:02:47 -06:00 |
|
snipe
|
5aa99a15d8
|
Merge pull request #13288 from snipe/fixes/line_based_markdown
Added Inline markdown method
|
2023-07-13 13:16:50 +01:00 |
|
snipe
|
016502f637
|
Added notesFormatter
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-13 13:14:10 +01:00 |
|
snipe
|
5d1f294f0e
|
Added parseEscapedMarkedownInline to accessories API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-13 12:03:01 +01:00 |
|
snipe
|
981c3a430d
|
Merge pull request #13301 from uberbrady/better_auto_increment_tags
Better auto increment asset-tags [FD-32892]
|
2023-07-13 09:49:44 +01:00 |
|
snipe
|
44231fa52c
|
Merge pull request #13225 from inietov/fixes/change_default_location_at_checkin
Fixed #13167 Default location not being set/updated upon check-in
|
2023-07-12 19:14:53 +01:00 |
|
snipe
|
d3c44a462e
|
Merge pull request #13268 from inietov/fixes/license_importer_missing_dropdown_items
Fixed License importer missing Checkout to: Username and Checkout to: Email in dropdown [sc-23456]
|
2023-07-12 17:11:27 +01:00 |
|
Brady Wetherington
|
76191a09ed
|
Improvements to asset_tag auto-incrementing, with auto-fixups for gaps
|
2023-07-12 16:39:45 +01:00 |
|
Ivan Nieto Vivanco
|
e0df8cc4aa
|
Add admin role to show encrypted customfield values
|
2023-07-11 17:21:32 -06:00 |
|
snipe
|
6d3bf1e5f5
|
Added additional method for inline
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-11 11:41:58 +01:00 |
|
snipe
|
9dc7fc93fb
|
Small fixes
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-11 11:14:19 +01:00 |
|
snipe
|
14c61e4c17
|
Added phone, fax to departments, locations, companies
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 19:44:21 +01:00 |
|
Ivan Nieto Vivanco
|
299e546021
|
Adds the Username and Email to License Importer dropdown
|
2023-07-06 18:36:13 -06:00 |
|
Ivan Nieto Vivanco
|
9591442f1e
|
Evaluate the radio input to update location only or default location too
|
2023-07-06 10:46:21 -06:00 |
|
Ivan Nieto Vivanco
|
743e852998
|
Add radio buttons to alter asset checkin location behavior
|
2023-07-06 10:38:48 -06:00 |
|
snipe
|
7937542dcb
|
Redirect if the license can’t be found
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 21:15:50 +01:00 |
|
snipe
|
fb9b3a5453
|
Switched from a colon to a hyphen to handle windows filesystems
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 20:32:20 +01:00 |
|
snipe
|
a3096e1b47
|
Merge pull request #13219 from inietov/features/cancel_request_asset
Cancel requested assets without checkin/out [ch-17606]
|
2023-06-29 16:18:13 +01:00 |
|
snipe
|
16ce06a3cc
|
Merge pull request #13222 from snipe/feature/sc-23427
Fixed #13213 - Use the Helper::parseEscapedMarkedown in notes
|
2023-06-29 16:16:25 +01:00 |
|
snipe
|
4c3a306a6e
|
More shuffling of scopes
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 13:35:41 +01:00 |
|
Ivan Nieto Vivanco
|
011726154c
|
Set rtd_location if a location is given at checkin
|
2023-06-29 03:16:59 -06:00 |
|
slong753
|
ea61f634fb
|
get rid of nice nullsafe
|
2023-06-28 16:48:52 -05:00 |
|
slong753
|
afe6fe207a
|
resolved, missed adding errors in a case
|
2023-06-28 16:45:18 -05:00 |
|
Ivan Nieto Vivanco
|
a4b8723dcb
|
Delete notes column map from assets importer
|
2023-06-28 11:38:51 -06:00 |
|
snipe
|
e1fdfd01f6
|
Merge pull request #13211 from marcusmoore/company-scoping
Improve testing around company scoping
|
2023-06-28 16:17:07 +01:00 |
|
snipe
|
8d8adc1639
|
Use the Helper::parseEscapedMarkedown in notes
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-28 15:02:32 +01:00 |
|
Marcus Moore
|
ab51857854
|
Check to see if model relationship exists before using it
|
2023-06-27 19:35:55 -07:00 |
|
Ivan Nieto Vivanco
|
8496e64e16
|
Adds ternary to set a quantity when needed
|
2023-06-27 18:37:22 -06:00 |
|
Ivan Nieto Vivanco
|
b4b84f91d0
|
Redirect to correct page after cancel action
|
2023-06-27 18:25:38 -06:00 |
|
Ivan Nieto Vivanco
|
1c29bd37a6
|
Added feature to cancel requests from the Requested Assets view
|
2023-06-27 18:11:10 -06:00 |
|
slong753
|
2a352619f7
|
clean up
|
2023-06-26 16:25:48 -05:00 |
|
slong753
|
691faf6340
|
ok, this kind of works - pr needs some clean up
|
2023-06-26 14:56:07 -05:00 |
|
Marcus Moore
|
3cb0920411
|
Merge branch 'develop' into company-scoping
|
2023-06-26 12:32:10 -07:00 |
|
Spencer Long
|
f646623a5e
|
Merge branch 'develop' into bulk_edit_custom_fields
|
2023-06-22 18:00:31 -05:00 |
|
akemidx
|
8df9db76bc
|
column ordering fix
|
2023-06-22 17:12:40 -04:00 |
|
akemidx
|
8725d40f8d
|
current value added to asset index page. translations for this in reports
|
2023-06-22 17:00:42 -04:00 |
|
snipe
|
78d8e32a22
|
Fixed weird order number thing
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-22 21:16:24 +01:00 |
|
Marcus Moore
|
8aae5beaba
|
Add explicit select back to query
|
2023-06-22 13:09:08 -07:00 |
|
Marcus Moore
|
a8133f62e8
|
Add explicit select back to query
|
2023-06-22 13:07:49 -07:00 |
|
Marcus Moore
|
ab5fed09db
|
Remove scopeCompanyables call from AssetsController@requestable
|
2023-06-22 12:36:43 -07:00 |
|
Marcus Moore
|
0a5e1e3190
|
Remove scopeCompanyables call from AssetsController@selectlist
|
2023-06-21 17:21:36 -07:00 |
|
Marcus Moore
|
fd55c99b87
|
Remove scopeCompanyables call from AssetsController@index
|
2023-06-21 16:29:44 -07:00 |
|
snipe
|
5d4e704fac
|
Added a comment
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-21 09:26:54 +01:00 |
|
snipe
|
2d9ddab3f0
|
Moved logic for tighter constraints when ids are passed
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-21 09:24:17 +01:00 |
|
snipe
|
f890e1f8b1
|
Merge pull request #13171 from snipe/features/importer/allow_update_by_user_id
Accept user ID as authoratative field for updates
|
2023-06-15 20:08:20 +01:00 |
|
snipe
|
21a27f43a9
|
Merge pull request #13158 from Godmartinz/asset_maint_warranty_bug
Added warranty confirmation to asset maintenance table
|
2023-06-15 19:34:16 +01:00 |
|
snipe
|
6c684bccd0
|
Accept user ID as authoratative field for updates
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-15 10:02:05 +01:00 |
|
Godfrey M
|
ee50906e44
|
attempt to add warranty to api controller
|
2023-06-13 11:20:55 -07:00 |
|
snipe
|
157a4341ea
|
Merge pull request #13041 from snipe/features/refactor_importer_for_localization
Refactor importer for localization
|
2023-06-13 18:12:07 +01:00 |
|
Godfrey M
|
fc86530c94
|
uses the trueFalseFormatter now
|
2023-06-13 09:10:42 -07:00 |
|
Godfrey M
|
69325beddb
|
adds warranty confirmation to asset maintenance table
|
2023-06-12 11:03:32 -07:00 |
|
Marcus Moore
|
8e6e525b47
|
Remove scopeCompanyables call from LicensesController
|
2023-06-07 16:09:45 -07:00 |
|
Marcus Moore
|
a18f5e7fc0
|
Remove scopeCompanyables call from ConsumablesController
|
2023-06-07 14:22:22 -07:00 |
|
snipe
|
b57730ee9d
|
Added missing assets_fields declaration
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-07 15:52:18 +01:00 |
|
Marcus Moore
|
48850f3597
|
Remove scopeCompanyables call from ComponentsController
|
2023-06-06 18:02:18 -07:00 |
|
snipe
|
7ae260b489
|
More license translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-01 19:51:06 +01:00 |
|
snipe
|
5e96fd200f
|
Refactor to remove general_fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 20:31:53 -07:00 |
|
snipe
|
3e4426c68c
|
Clearer comments
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 19:20:52 -07:00 |
|
snipe
|
d4c5a4eb2e
|
More aliases
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 13:18:32 -07:00 |
|
snipe
|
f2e9b41199
|
More user fields in asset importer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 12:57:34 -07:00 |
|
snipe
|
d0f5a044ba
|
More refactoring
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 12:13:06 -07:00 |
|
Ivan Nieto Vivanco
|
086265455d
|
Pass user count to the eloquent query
|
2023-05-23 11:53:09 -06:00 |
|
snipe
|
f9449aa81f
|
Merge pull request #13069 from marcusmoore/fixes/add-eager-load-to-asset-model-endpoint
Add eager loading to Asset Models controller
|
2023-05-22 14:39:32 -07:00 |
|
Marcus Moore
|
a6eeae6541
|
Eager load fieldset default values in asset model endpoint
|
2023-05-22 14:19:03 -07:00 |
|
snipe
|
96e86501ad
|
Additional alias fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-22 13:20:08 -07:00 |
|
snipe
|
511d83cc47
|
Added/fixed a few more translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-20 14:52:42 -07:00 |
|
snipe
|
1396e314c4
|
Updated arrays with translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-20 14:21:13 -07:00 |
|
snipe
|
b75109dcac
|
Added component mapping switch
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-20 14:20:49 -07:00 |
|
snipe
|
2c4c9a16c9
|
Refactored the static arrays into mount arrays for translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-16 22:31:58 -07:00 |
|
snipe
|
3296716dfa
|
Added EOL date to importer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-16 19:06:35 -07:00 |
|
snipe
|
71234228b4
|
Merge pull request #13025 from Godmartinz/archived_clears_assigned_to
removes assigned_to if archived
|
2023-05-16 17:25:24 -07:00 |
|
snipe
|
02cacf76c6
|
Additional multi-select options for custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-16 13:58:21 -07:00 |
|
Godfrey M
|
8e3cbdad90
|
removes assigned_to if archived
|
2023-05-15 11:52:57 -07:00 |
|
snipe
|
0f3b77ee2d
|
Added multi-select option to custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 14:45:31 -07:00 |
|
slong753
|
5e34ffa2b0
|
wip
|
2023-05-10 14:08:12 -05:00 |
|
snipe
|
9f39d71f16
|
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report
Added Multiselect of companies for custom reports
|
2023-05-10 11:36:21 -07:00 |
|
snipe
|
7c77f4a697
|
Extra debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 09:10:53 -07:00 |
|
akemidx
|
537aa04c9a
|
Merge branch 'develop' into delete_asset_from_view_page
|
2023-05-10 09:30:54 -04:00 |
|
snipe
|
788c03ef57
|
Hide client secret if app is locked
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:22:49 -07:00 |
|
snipe
|
2dd32d8785
|
Re-add the image update
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:18:27 -07:00 |
|
snipe
|
ff66a938c1
|
Clearer comments
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:18:15 -07:00 |
|
snipe
|
7f0e677908
|
Use normal translation style
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:18:05 -07:00 |
|
snipe
|
e8a0c7f2ce
|
Remove avatar update, since we don’t take URLs for that
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:59:33 -07:00 |
|
snipe
|
e950cf4279
|
Switch to using username as match for google login
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:58:36 -07:00 |
|
snipe
|
567a800c51
|
Added debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:47:52 -07:00 |
|
snipe
|
e5eb5932ca
|
Create constructor to override expected config variables
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:37:03 -07:00 |
|
snipe
|
3612526632
|
Disallow saving data if app is locked
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:14:54 -07:00 |
|
snipe
|
aefd330e4e
|
Added methods for google settings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:54:28 -07:00 |
|
snipe
|
b7e8ce3064
|
Changed redirect
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:54:14 -07:00 |
|
snipe
|
c52b48c383
|
Google oauth login
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:14:28 -07:00 |
|
slong753
|
1d2596fc54
|
wip
|
2023-05-09 14:58:59 -05:00 |
|
snipe
|
332b017dcc
|
Pass filename for manual backups
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 15:00:02 -07:00 |
|
snipe
|
5960a5425d
|
Pass filename to pre-import backup
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 14:48:26 -07:00 |
|
snipe
|
6486ea4fb7
|
Merge pull request #12976 from inietov/fixes/validate_soft-deleted_models_in_asset_model
Refactor of #12955
|
2023-05-08 13:14:02 -07:00 |
|
snipe
|
d685335aea
|
Merge pull request #12975 from inietov/fixes/import_asset_notes
Fixed Notes field doesn't get populate when creating/updating assets via Importer [sc-23222]
|
2023-05-08 13:11:50 -07:00 |
|
snipe
|
d70e14de61
|
Merge pull request #12972 from marcusmoore/bug/sc-23177
Fixes user name missing in accessory acceptance notifications
|
2023-05-08 13:04:37 -07:00 |
|
snipe
|
8b73fa0053
|
Added missing use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-06 06:36:09 -07:00 |
|
Ivan Nieto Vivanco
|
fbb7c55450
|
Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models
|
2023-05-04 03:12:36 -06:00 |
|
Ivan Nieto Vivanco
|
89fbd60d97
|
Restore the 'Asset Notes' and 'Model Notes' in the Map Asset Import Fields form
|
2023-05-04 02:00:04 -06:00 |
|
Marcus Moore
|
96c6d8896f
|
Add additional information to acceptance notifications for assets, accessories, and consumables
|
2023-05-03 17:04:01 -07:00 |
|
Marcus Moore
|
4a0b3efd1f
|
Include user's name in Acceptance result notifications for accessories
|
2023-05-03 14:22:05 -07:00 |
|
slong753
|
815c77f943
|
wip
|
2023-05-03 14:49:31 -05:00 |
|
snipe
|
fe710efb40
|
Merge pull request #12874 from Godmartinz/feature/sc-23130
Adds a checkout range for custom asset reports
|
2023-05-03 11:43:44 -07:00 |
|
snipe
|
fc53b56481
|
Merge pull request #12955 from inietov/fixes/error_500_after_sign_and_accept_asset
Fixed Error 500 after sign and accept asset
|
2023-05-03 11:43:14 -07:00 |
|
snipe
|
b716f9f55e
|
Merge pull request #12916 from snipe/features/auto_add_to_fieldset
Added ability to auto-add fields to new fieldsets
|
2023-05-03 11:04:33 -07:00 |
|
snipe
|
ea17fdeba5
|
Merge pull request #12846 from snipe/features/livewire_location_import
Location importer via Livewire Importer
|
2023-05-03 11:02:06 -07:00 |
|
snipe
|
f5cd58e9b7
|
Unmix return type variables
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-03 10:57:02 -07:00 |
|
snipe
|
da4841987e
|
Use translation string
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-03 10:55:30 -07:00 |
|
snipe
|
914b2658cc
|
Merge pull request #12943 from marcusmoore/fixes/avoid-loading-unused-models-for-report
Remove the loading of asset maintenances that are not used by view
|
2023-05-03 10:41:52 -07:00 |
|
slong753
|
cdda4a56d8
|
aha, ok thisd kind of works
|
2023-05-02 19:11:43 -05:00 |
|
slong753
|
b2c2097e8b
|
just more troubleshooting stuff, still no solution
|
2023-05-02 18:54:20 -05:00 |
|
Ivan Nieto Vivanco
|
6936d76661
|
Prevent hard fail when retrieving acceptance data
|
2023-05-01 16:50:18 -06:00 |
|
Ivan Nieto Vivanco
|
1b2d830380
|
Check if model exists before create asset via API
|
2023-05-01 16:05:03 -06:00 |
|
Marcus Moore
|
3cae32b236
|
Eager load default locations
|
2023-04-27 17:13:09 -07:00 |
|
Marcus Moore
|
429c4cb99f
|
Remove the loading of asset maintenances that are not used by view
|
2023-04-27 17:12:53 -07:00 |
|
snipe
|
567e19bcc0
|
Added missing case for licenses for item_count
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-27 16:26:50 -07:00 |
|
akemidx
|
d94bed3f57
|
push for testing
|
2023-04-27 18:58:59 -04:00 |
|
snipe
|
54a766c4f9
|
Added dynamic warranty URL to manufacturers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 16:39:15 -07:00 |
|
snipe
|
5eac314f4d
|
Merge pull request #12906 from akemidx/feature/sc-20622
Dynamic warranty link for manufacturers' support urls
|
2023-04-26 14:49:22 -07:00 |
|
akemidx
|
497d17835f
|
requested edits
|
2023-04-26 17:06:08 -04:00 |
|
slong753
|
52c9fefbe0
|
ok, this works except error display
|
2023-04-26 15:06:50 -05:00 |
|
akemidx
|
aab53cf683
|
remove regex, add in starts_with
|
2023-04-26 15:18:13 -04:00 |
|
snipe
|
8f0b823fb3
|
Applies #12868
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 23:39:32 -07:00 |
|
snipe
|
22d73f503a
|
Merge pull request #12756 from dboth/develop
Fixed #8208, #8896, #8985 and #9789: Currency issues when using non-english locales (resubmission)
|
2023-04-25 22:32:13 -07:00 |
|
snipe
|
d6ea5de5b8
|
Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset
|
2023-04-25 22:20:50 -07:00 |
|
snipe
|
c8c6f879d4
|
Merge pull request #12912 from Godmartinz/ldap_location_sync
added ldap_location to settings
|
2023-04-25 21:54:28 -07:00 |
|
snipe
|
45f22e7561
|
Updated the sync to disassociate if all boxed are unchecked
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:31:23 -07:00 |
|
snipe
|
5759d2c948
|
Added a check to fail validation if the associated fieldsets are not value
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:30:47 -07:00 |
|
snipe
|
15dc4e4779
|
Added fieldset sync
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:29:57 -07:00 |
|
slong753
|
6bec9cf880
|
fix a couple things
|
2023-04-25 23:26:16 -05:00 |
|
snipe
|
5eeca937cb
|
Added logic for syncing fieldset info
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:08:26 -07:00 |
|
snipe
|
662b7787a1
|
Updated redirect return
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:07:50 -07:00 |
|
snipe
|
28d9cec1e3
|
Added auto_add_to_fieldsets to API response
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 20:59:48 -07:00 |
|
Godfrey M
|
cb68f41d9c
|
added ldap_location to settings
|
2023-04-25 11:44:04 -07:00 |
|
snipe
|
66ce02fc48
|
Added permission on restore
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 08:09:16 -07:00 |
|
snipe
|
6e7f0728fd
|
Added more granular permissions on bulk actions for assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 08:06:45 -07:00 |
|
akemidx
|
9cd2783185
|
Regex added for link instead
|
2023-04-24 20:07:21 -04:00 |
|
Marcus Moore
|
2aba8252f3
|
Ensure users editing themselves do not deactivate their account
|
2023-04-20 21:59:55 -07:00 |
|
akemidx
|
16a5a883e5
|
new request, preparing support_url for validation
|
2023-04-20 16:34:25 -04:00 |
|
Ivan Nieto Vivanco
|
747d6cfdb4
|
Change the flow of the condition using an early return
|
2023-04-20 10:37:26 -06:00 |
|
Ivan Nieto Vivanco
|
ae53609b1b
|
Declare variables only if license is found
|
2023-04-20 10:16:11 -06:00 |
|
Godfrey M
|
bdd1045272
|
adds a checkout range for custom asset reports
|
2023-04-19 09:11:44 -07:00 |
|
snipe
|
3a808aa806
|
Updated method for available seat count
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:44:33 -07:00 |
|
snipe
|
dc6eb6f104
|
Throw a warning if there were no users affected
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:07:17 -07:00 |
|
snipe
|
a8a3ca3624
|
Use count on availSeats
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:06:42 -07:00 |
|
snipe
|
f21d9c27e6
|
Use new translations for logs
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 01:07:26 -07:00 |
|
snipe
|
bfcbd9628a
|
Refactored license controller with new counts
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 01:02:58 -07:00 |
|
snipe
|
087f0e596a
|
Fixed has to where
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 22:44:05 -07:00 |
|
snipe
|
99cecee4b5
|
Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui
|
2023-04-17 14:54:30 -07:00 |
|
slong753
|
52dc99588e
|
pushing for now, needs validation work
|
2023-04-17 13:57:48 -05:00 |
|
Kevin Köllmann
|
04f3c4bf69
|
Fixed #12854: Allow checkout of available components down to zero stock
|
2023-04-17 11:45:11 +02:00 |
|
snipe
|
a83991041a
|
Better placement for errors
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 16:08:06 -07:00 |
|
snipe
|
16ab2bec06
|
Added sorting and searching on autoassign_licenses via user API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 15:27:39 -07:00 |
|
snipe
|
4b66ca6ac5
|
Added method to bulk checkin (much simpler than checking out)
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 15:27:15 -07:00 |
|
snipe
|
844ad83431
|
Added method to bulk checkout license seats
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 15:26:59 -07:00 |
|
snipe
|
9833d861d4
|
Added autoassign_licenses tp bulk users conditional
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 15:26:33 -07:00 |
|
snipe
|
03cc55cb6a
|
Set autoassign_licenses to false if unchecked
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 15:25:52 -07:00 |
|
snipe
|
6a94a2f515
|
Return true/false for autoassign_licenses in the API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 15:25:26 -07:00 |
|
snipe
|
79ff6a8fc2
|
Disallow deleting in the API view if there are things checked out
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 12:30:23 -07:00 |
|
snipe
|
8183b8deba
|
Added stub method
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 12:30:02 -07:00 |
|
snipe
|
64256351d8
|
Used a singleton to filter API limit value
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 08:46:39 -07:00 |
|
snipe
|
78ec21acc4
|
Added location case
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 07:47:49 -07:00 |
|
snipe
|
5a1d03c1dc
|
Added alias maps
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 07:47:42 -07:00 |
|
snipe
|
955539807c
|
Merge pull request #12830 from snipe/features/adds_supplier_id_to_components
Added supplier to components and consumables
|
2023-04-15 18:42:23 -07:00 |
|
snipe
|
fc7f1f907d
|
Fixed variable name
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 17:37:25 -07:00 |
|
snipe
|
4cbb9c2409
|
Use abs() instead of max
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 17:28:25 -07:00 |
|
Godfrey M
|
ab67d903b5
|
adds multi select to custom report for companies
|
2023-04-13 12:02:11 -07:00 |
|
snipe
|
2fe7fcecdb
|
Added case switch for sorting on suppliers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-13 11:13:45 -07:00 |
|
snipe
|
d2b3e251ad
|
Added counters to API controllers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-13 11:12:16 -07:00 |
|
snipe
|
07c0a1927b
|
Added supplier id to controllers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-13 11:12:01 -07:00 |
|
snipe
|
ab7c75232b
|
Added supplier to transformers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-13 11:10:51 -07:00 |
|
snipe
|
6e183f2ced
|
Added counters for consumables and components
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-13 11:10:32 -07:00 |
|
slong753
|
8b9aea8874
|
very much WIP, but dupe queries reduced
but i think this can be cleaned up a bit more
|
2023-04-12 14:46:48 -05:00 |
|
snipe
|
112a04b108
|
Better handle weird data passed to the API via limit and offset
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-12 11:28:46 -07:00 |
|
snipe
|
70ce0d9ee6
|
Maintain activated state on editing a user
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-09 14:06:29 -07:00 |
|
snipe
|
baf267e2e9
|
Small cleanups
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-07 09:45:16 -07:00 |
|
snipe
|
cb76815e8b
|
Removed if check on assets, since that’s already handled via validation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-07 09:42:31 -07:00 |
|
snipe
|
4c88c751ef
|
Code cleanup, better validation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-06 22:03:40 -07:00 |
|
snipe
|
0abb993600
|
General cleanup and standardization for component API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-06 22:02:57 -07:00 |
|
snipe
|
4840046f44
|
Check for available quantity on consumables before checkout
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-06 20:38:02 -07:00 |
|
snipe
|
ffdc0d76f7
|
Fixed accessories verifying that enough remain to be checked out
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-06 18:40:29 -07:00 |
|
snipe
|
383d48fd9c
|
Merge pull request #12787 from Godmartinz/accessory_unavailable_message
Added unavailable message to prevent over-checkout of Accessories
|
2023-04-06 15:05:18 -07:00 |
|
snipe
|
bd4757ad7a
|
Merge pull request #12779 from snipe/features/replace_icheck_with_only_css
Move from iCheck to pure CSS for radio and checkboxes
|
2023-04-06 14:58:33 -07:00 |
|
Godfrey M
|
3d7c55deb3
|
removed an unncessary query
|
2023-04-06 13:06:05 -07:00 |
|
Godfrey M
|
55943d8897
|
uses numRemaining now
|
2023-04-06 10:05:17 -07:00 |
|
snipe
|
161999fbca
|
Fixed #12772 - use the APP_URL config more consistently
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-05 16:05:40 -07:00 |
|
snipe
|
752365aa85
|
Updated support URL
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-05 14:54:40 -07:00 |
|
Godfrey M
|
b038fe8f2e
|
adds unavailable message to overcheckout
|
2023-04-05 10:00:39 -07:00 |
|
snipe
|
8b315a6502
|
Updated contrller to use trans_choice
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 18:55:09 -07:00 |
|
snipe
|
cfef9d8cca
|
Merge pull request #12763 from inietov/fixes/call_to_member_function_licenses_on_null
Fixed Call to a Member Function Licenses() on null [sc-20606]
|
2023-03-30 14:20:13 -07:00 |
|
slong753
|
0f72554a9f
|
translations for messages
|
2023-03-30 13:57:18 -05:00 |
|
slong753
|
382d849ee1
|
added catch for no assets selected
|
2023-03-30 13:52:29 -05:00 |
|
Ivan Nieto Vivanco
|
d10b7fd6af
|
Use firstorfail on eloquent query to return error if asset is not found
|
2023-03-29 19:11:28 -06:00 |
|
slong753
|
e4c76f454c
|
this is good, just needs translations done in view
|
2023-03-29 18:24:56 -05:00 |
|
slong753
|
162b70d5a9
|
wireframed, needs a view and should work
|
2023-03-29 17:34:36 -05:00 |
|
slong753
|
65bbecd145
|
this all works - could use some eyes
|
2023-03-29 14:46:31 -05:00 |
|
Dominik Both
|
3271c9dc9f
|
Fix #8208, #8896, #8985, #9789
|
2023-03-29 09:56:34 +02:00 |
|
slong753
|
032ae4348e
|
custom fields display, need to get saving
+some clean up
|
2023-03-28 21:45:31 -05:00 |
|