DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 18:14:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
15163 commits 96 branches 267 tags 295 MiB
Commit graph

3083 commits

Author SHA1 Message Date
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
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 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
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 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
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 15d11f7f4e test checkout to user on store 2023-11-28 21:46:03 -06:00
akemidx 2a54797dce permission level proof of formatting 2023-11-28 17:58:37 -05:00
akemidx 9770016eec beginning of permission groups export 2023-11-28 17:47:36 -05: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
Spencer Long 19850e8c5a
Merge branch 'snipeit_v7_laravel10' into chore/sc-16907 2023-11-15 20:37:15 -06:00
spencerrlongg eaa68327f7 SINGLE QUOTES 2023-11-15 16:27:01 -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 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 3f834cb88f authorization tested in request 2023-11-01 11:43:53 -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 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 05de8a5731 Re-added missing break 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 09:21:27 +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 887d013a39 Added listable fields in profile -> requested assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:42:33 +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 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
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
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 752171d5b8 Use singleton for offset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 20:05:11 +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 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 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
Marcus Moore a47e36c1e5 Add custom fields as options 2023-09-27 16:51:53 -07:00
snipe 279e6c7e4f Check for null company ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-26 14:33:42 +01: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
spencerrlongg d65d1930e4 asset models 2023-09-19 19:24:53 -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 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
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
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
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 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 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
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 M 8ebb9afedd adds min_amt to asset model edit, index, and table 2023-08-24 10:30: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
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
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
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 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
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 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
snipe df8f6a8d2b Correctly call the route for accessory index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-11 09:40:49 +01:00
Marcus Moore c32f099053
Remove unneeded call to Company::scopeCompanyables 2023-08-08 17:22:15 -07:00
Marcus Moore 7c5a1b376e
Remove redundant Company::scopeCompanyables wrapper 2023-08-07 16:54:23 -07:00
Ivan Nieto Vivanco 053d3fc9ed Prevent asset to be checked out if full company support is enabled and companies not match 2023-08-02 19:23:28 -06:00
Ivan Nieto Vivanco 9ca163e8cf Stop asset acceptances from shown to user if full company support is enabled and companies not match 2023-08-02 19:22:35 -06:00
snipe ffb605a37c
Merge pull request #13309 from inietov/fixes/checkout_range_doesnt_include_today 
Fixed #13300 Custom Asset Report, Checkout date range never includes current day
 2023-07-31 15:04:22 +01:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
Ivan Nieto Vivanco 0a841ddbb8 Change component validator to the correct asset id we're passing in the API call 2023-07-27 20:22:13 -06:00
Ivan Nieto Vivanco c015264181 Adjust the license offset if it exceeds the total of license seats 2023-07-25 16:23:33 -06:00
snipe a01cb26aac
Merge pull request #12940 from akemidx/delete_asset_from_view_page 
Delete button on asset view page
 2023-07-25 12:11:35 +01:00
Ivan Nieto Vivanco cb4ed92639 Use Carbon date objects instead of casting using DB::raw() 2023-07-20 16:17:06 -06:00
Tobias Franzius 90a344af0b Fixes #13341 Clean up correct seats on license delete 
Before this, we checked for the `id` collumn in the `license_seats` table, insteasd of
using `license_id` for this.

This way, we ensure that we only alter seats belonging to the correct license.
 2023-07-20 13:48:57 +02:00
snipe a19a508a80
Merge pull request #13197 from akemidx/current_value_for_assets 
Current value added to asset index page
 2023-07-19 19:06:15 +01:00
snipe b54e7dc3ee Fixed #13336 - Save unhashed password if no password provided 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-19 17:44:40 +01:00
snipe 18e2ec4dad
Merge pull request #13310 from marcusmoore/bug/sc-23478 
Fixed the inability to load location select when editing profile
 2023-07-18 13:26:30 +01:00
snipe 3078cab7ee Added ability to show/hide custom fields in list views by default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 09:09:43 +01:00
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 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
Brady Wetherington 76191a09ed Improvements to asset_tag auto-incrementing, with auto-fixups for gaps 2023-07-12 16:39:45 +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 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 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 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
Godfrey M ee50906e44 attempt to add warranty to api controller 2023-06-13 11:20:55 -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
Marcus Moore 48850f3597
Remove scopeCompanyables call from ComponentsController 2023-06-06 18:02:18 -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
ak-piracha 457f4c410a add check for default consumable qty 2023-05-21 23:11:03 +09:30
ak-piracha bb013d5c3c Bulk Consumable Checkout 2023-05-21 22:49:00 +09:30
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 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
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
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
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
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 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
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 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 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
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
slong753 804a788a27 initial fetch working 2023-03-28 20:31:24 -05:00
snipe c9d1274edc
Merge pull request #12753 from snipe/fixes/lang_for_group_not_found 
Fixes/lang for group not found
 2023-03-28 16:45:22 -07:00
snipe 32922e6461 Use corrected language string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:39:52 -07:00
Ivan Nieto Vivanco 77d513f80b Assign target variable as the other checkout types 2023-03-28 17:25:57 -06:00
Ivan Nieto Vivanco d70b7dbf41 Checks if exist on API checkout 2023-03-28 16:12:48 -06:00
snipe e869b1fd53 Fixed #12724 - fieldset not saving on model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 06:11:24 -07:00
snipe 545d023a18 Handled a few more hard-coded strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:56:07 -07:00
snipe 473211397f
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent 
Livewire importer without subcomponent
 2023-03-21 23:07:04 -07:00
snipe e08327be95 Ability to remove user location from users 
Rework of #9677 - sorry @godmartinez - I suck :(

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:03:57 -07:00
snipe 418ce75a9f
Merge pull request #11431 from ntbutler-nbcs/develop 
[Fix / Minor Change] Asset checkinbytag now consistent with existingAPI
 2023-03-21 22:40:21 -07:00
snipe c229d69cec Added next audit date override in bulk asset edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 16:01:41 -07:00
snipe 4f8542b71b
Merge pull request #12680 from akemidx/clone_accessories 
Clone accessories
 2023-03-21 13:37:04 -07:00
snipe f2a3c2a349
Merge pull request #12693 from snipe/fixes/use_statements 
Updates the Gate “use” statement to be more specific
 2023-03-18 12:00:23 -07:00
snipe f9e190eb32 Updates the Gate “use” statement to be more specific 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 11:58:09 -07:00
snipe 8dd3ae8a37 Corrected gates, added fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 11:53:20 -07:00
snipe 82dc57aa18 Renamed some variables, invoked the event listener 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:24:58 -07:00
snipe 9ac4efb912 Better commenting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:24:38 -07:00
snipe 30cf7eb750 Disallow action in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:42:50 -07:00
snipe 0dd11575c5 Added merge controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:19:16 -07:00
snipe b374834999 Added extra order by switch for first_name and last_name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 16:07:51 -07:00
snipe 5e4455f042 Deleted duplicate statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 16:07:36 -07:00
akemidx a8e2f72e25 accessory cloning, WITHOUT copying over the image. 2023-03-15 16:55:24 -04:00
snipe e9601bcf13 Handle already-deleted license files more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-15 13:05:51 -07:00
akemidx a3353b8496 committing 2023-03-15 13:48:22 -04:00
snipe 4c66267f3b
Merge pull request #12668 from inietov/fixes/undefined_array_key_0 
Fixed ErrorException: Undefined array key 0 [sc-20424]
 2023-03-14 17:10:04 -07:00
slong753 60b70a4074 catch and redirect back with error 2023-03-14 16:07:09 -05:00
snipe dfd9fcc5e0
Merge pull request #12599 from inietov/fixes/unknown_column_0_in_field_list 
Fixed Column not found: 1054 Unknown column '0' in 'field list' [sc-20004]
 2023-03-14 09:51:42 -07:00
Ivan Nieto Vivanco 67471a3a77 Evaluate if the collection is empty before access the array index 2023-03-13 21:44:06 -06:00
Ivan Nieto Vivanco d224f3177e Delete a rule that was breaking validation 2023-03-13 16:43:10 -06:00
Ivan Nieto Vivanco e7b3daa80c Adjust validator to only receive valid groups id's 2023-03-13 16:10:08 -06:00
Ivan Nieto Vivanco e4204a6dd1 Adds validator to PATCH request in the API UsersController 2023-03-13 15:49:05 -06:00
snipe dccd6fd4b1 Duplicate withCount 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:06:14 -08:00
snipe 7f8bdbd252 Added showableAssets() relationship to Category model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:01:38 -08:00
Brady Wetherington 09c1298e03 Merge branch 'develop' into livewire_importer_2_squashed_and_rebased 
I'll be taking in the changes to the importer front-end elsewhere
 2023-03-07 18:51:05 -08:00
akemidx ec5836dab4 cloning accessories first bit 2023-03-07 16:41:48 -05:00
snipe 1ebbc767f1
Merge pull request #12624 from snipe/features/added_vip_and_byod_to_importer 
Added `vip` and `byod` to importer
 2023-03-06 17:11:28 -08:00
snipe e1069ac234 Return a file not found error if it doesn’t appear on disk 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 15:09:37 -08:00
snipe 8b6e8898c1 Fixed hardcoded string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 15:09:12 -08:00
snipe 2cb06165c4 Added missing vip field to transformer and request 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 15:00:04 -08:00
snipe cc7325074e Check that the file exists before trying to stat it for filesize 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 10:47:28 -08:00
snipe f54d83ed59
Merge pull request #12612 from manuteleco/add_path_in_preflight_url_message 
Fixed #11800: Include path in the expected URL during Pre-Flight
 2023-03-06 09:36:15 -08:00
Manuel Rodríguez Guimeráns 548ae7ad22 Add Reverse Proxy support to Pre-Flight URL check 
Before this change, the Pre-Flight URL check would inevitably fail
whenever Snipe-IT was running behind a reverse proxy or load balancer.

The URL check tries to ensure that the configured application URL
matches the URL that is actually used to reach the application. However,
when running behind an HTTP intermediary (like a reverse proxy or a load
balancer) the HTTP connection that Snipe-IT receives is not the _real_
connection from the user anymore, but a connection from the HTTP
intermediary. The scheme, host and port that Snipe-IT would obtain from
that incoming intermediary connection wouldn't match what is configured
as application URL and, therefore, the URL check would fail.

This commit solves the situation by making Snipe-IT's Pre-Flight URL
check aware of the `X-Forwarded-Proto` and `X-Forwarded-Host` HTTP
headers. These headers represent the _de-facto_ standard used by reverse
proxies and other HTTP intermediary components to convey information
about the incoming HTTP connection to the upstream application. Being
the upstream application, Snipe-IT can then make use of this information
to correctly evaluate the validity of the configured application URL.
 2023-03-05 18:15:16 +01:00
Manuel Rodríguez Guimeráns 1d4f4b92de Include path in the expected URL during Pre-Flight 
So that the message displayed to the user when the URL Pre-Flight check
fails is:

> Snipe-IT thinks your URL is SCHEME://DOMAIN, but your real
  URL is SCHEME://DOMAIN/setup

instead of:

> Snipe-IT thinks your URL is SCHEME://DOMAIN/setup, but your real
  URL is SCHEME://DOMAIN/setup

Having a missing "/setup" in the expected URL might confuse the user
into thinking that it is an additional configuration problem they need
to fix.

With this change, the comparison between the expected and actual URL
will not contain any accidental difference anymore. Only those that the
user really needs to be aware of and fix in their setup.
 2023-03-05 17:52:45 +01:00
Ivan Nieto Vivanco 95f568b934 Remove unnecessary try/catch 2023-03-02 19:50:47 -06:00
Ivan Nieto Vivanco 8a5d426ccd Use correct LicenseSeat property 2023-03-02 19:33:32 -06:00
Ivan Nieto Vivanco e0b2dc043a Adds try/catch to users API 2023-03-02 11:13:56 -06:00
snipe b8231f420b Remove name from blanking paroperties 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 14:12:33 -08:00
snipe 84a14918bb Updated comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 14:03:33 -08:00
snipe 473553c464 Moved gate 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 14:01:40 -08:00
snipe dac877f184 Added location clone 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 13:51:35 -08:00
Brady Wetherington ca849db316 The 'download activity report' displayed the wrong value for 'admin' 2023-03-01 12:23:13 -08:00
snipe 562546a853 Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 23:37:30 -08:00
snipe 4860440306 Check that it’s an array (versus checking that it’s not a bool) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 23:32:10 -08:00
snipe b72a9cc6fd Check if the $owner is boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 23:31:26 -08:00
snipe 463ef02fae
Merge pull request #12578 from inietov/fixes/undefined_variable_total 
Fixed Undefined variable `$total`
 2023-02-28 20:50:00 -08:00
Brady Wetherington 2f94bf96ff Everything's all wired up; just need to clean up all the FIXME's and stuff 2023-02-28 18:36:52 -08:00
snipe 1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable 2023-02-28 18:05:09 -08:00
Ivan Nieto Vivanco 1be0a8d911 Declare variable as an empty array 2023-02-28 10:22:49 -06:00
Ivan Nieto Vivanco 9d94bd6567 Validate if the license seat is not checked out, it can't be checked in 2023-02-27 18:57:38 -06:00
Brady Wetherington 0a085af0a0 Getting the basic wiring of the importer over into Livewire 
WIP: Wiring up more and more of the actions on the importer

Files now upload okay, a little glitchy on the display-side though

add to readmes so i dont forget
 2023-02-27 14:28:59 -08:00
snipe 96c851468c Added max results limit to report index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-27 12:04:46 -08:00
snipe 3e47d9e689 Pass the existing asset name to the bulk checkout form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-24 09:54:46 -08:00
snipe 5e6ebb9a65
Merge pull request #12410 from uberbrady/paginate_accessories_report 
Paginate accessories report
 2023-02-23 12:26:17 -08:00
snipe 8e72da42e8
Merge pull request #12406 from akemidx/vip_tag 
Added a checkbox to notate VIP status
 2023-02-23 12:23:29 -08:00
snipe eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies 
Fix full company scoping in user selects
 2023-02-23 10:36:33 -08:00
akemidx 690970b4aa fixing ff error 2023-02-22 18:18:20 -05:00
snipe 4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during 
Adds Boolean to Users Table for Auto Assigning Licenses
 2023-02-21 20:10:46 -08:00
snipe 0c3115553e
Merge branch 'develop' into vip_tag 2023-02-21 20:03:49 -08:00
snipe ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs 
Adds Livewire slack inputs
 2023-02-15 13:27:07 -08:00
snipe 3800cdd0da
Merge pull request #12466 from snipe/fixes/style_fixes 
Style fixes
 2023-02-15 11:07:59 -08:00
Ivan Nieto Vivanco 6936efd387 Remove e() function from customfield format input 2023-02-12 16:27:37 -06:00
snipe b0b1c96ab5
Merge pull request #12514 from marcusmoore/fixes/preserve-asset-name-during-api-checkout 
Fix asset names being removed during API checkout requests
 2023-02-14 12:22:03 -08:00
Marcus Moore 8e00191b69
Add comment 2023-02-14 12:19:16 -08:00
Marcus Moore a94f19a68e
Use name if provided by asset checkout request 2023-02-14 12:08:20 -08:00
Marcus Moore 2349f54013
Use translation strings for importer exceptions 2023-02-13 13:30:36 -08:00
Marcus Moore 73f355f3a8
Return 422 instead of 500 when import is invalid 2023-02-08 12:39:42 -08:00
Marcus Moore b3881a43a7
Fix return type 2023-02-08 12:34:25 -08:00
Marcus Moore c2c666aef0
Formatting 2023-02-08 12:32:57 -08:00
Marcus Moore 5962f1b627
Catch json encoding exceptions and display them to the user 2023-02-08 12:21:51 -08:00
snipe c1d484b5df Fixed mismatched field/fieldset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 13:31:50 -08:00
snipe d52d32fed9 Fixed visibility for constants and methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:44:02 -08:00
snipe 7363d4e223 FIxed yoda operator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:43:35 -08:00
snipe c8c5dddcc1 Removed unused else condition 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:43:19 -08:00
Marcus Moore 38cdcdf064
Eager load company 2023-02-06 10:59:51 -08:00
snipe 51f3857a31 Fixed something I think I broke 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 15:32:45 -08:00
akemidx b8951e2b54 fixing name from vipuser to vip 2023-02-02 15:58:05 -05:00
Godfrey M 17f1772143 removes postslack from settings controller 2023-02-01 16:58:08 -08:00
Godfrey M 3a86547ef5 fixes messages for integration test, removes slack request file, rehouses ajax method 2023-02-01 16:51:05 -08:00
snipe d9cdb92014
Merge branch 'develop' into vip_tag 2023-02-01 16:03:23 -08:00
snipe 1a8fb5bcfe
Merge pull request #12423 from snipe/features/edit_fieldset_name 
Fixed #12418 - added ability to edit custom field names via GUI
 2023-02-01 13:39:39 -08:00
Godfrey M f95a904d90 adds integration button, working on its functionality 2023-02-01 12:08:13 -08:00
cram42 0f3c5d10ba Merge branch 'feature-label2' into develop 2023-02-01 18:01:46 +11:00
cram42 73fd0a24ca Clarify example asset variable 2023-02-01 17:58:58 +11:00
cram42 4b4c228f1a Correct parameter order 2023-02-01 17:56:23 +11:00
snipe f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories 2023-01-31 19:56:43 -08:00
snipe 2d45ebe103
Merge pull request #12433 from inietov/fixes/asset_declined_date_issues 
Fixed Invalid date value on assets acceptance mail notification
 2023-01-31 19:14:51 -08:00
lukasfehling cddae4869f fixed the endpoint for user notification with all their assigned assets 2023-01-31 18:27:25 +01:00
Ivan Nieto Vivanco ccc7b78f62 Store the acceptance dates with format YYY-mm-dd 2023-01-30 15:11:41 -06:00
snipe 22b0b9b090 Fixed gates on fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:05:41 -08:00
snipe 583a0412fe Added edit fieldsets translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:03:23 -08:00
Brady Wetherington 4a54586690 Add to Accessories#index an additional gate-check against reports.view 2023-01-26 11:56:06 -08:00
akemidx 53d8008a5f Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag 2023-01-25 17:14:29 -05:00
akemidx b363524305 vipuser label updated to vip 2023-01-25 15:58:44 -05:00
snipe 4c3354b778
Merge branch 'develop' into vip_tag 2023-01-24 20:29:43 -08:00
Brady Wetherington b00333c9f5 Merge remote-tracking branch 'upstream/develop' into develop 2023-01-24 17:36:39 -08:00
Brady Wetherington c9f0f5fe8b Change Accessories report to use server-side pagination from URL 2023-01-24 17:35:44 -08:00
akemidx 596846a94a Add VIP Checkbox 2023-01-24 15:29:27 -05:00
Marcus Moore b92d1d3ec7
Logically group query when searching users to scope to company 2023-01-24 11:54:56 -08:00
snipe dc155846ca Hoist the autorization higher in the stack so we’re not doing logic or math when the user isn’t authorized to touch this 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-23 21:49:17 -08:00
snipe 7a9ea91be0
Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete 
Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck
 2023-01-23 21:39:55 -08:00
snipe 02dcb0fbd7 Shorten the additiona form request invocation to just ImageUploadRequest 
We already have the `use App\Http\Requests\ImageUploadRequest` clause at the top of this file.

Signed-off-by: snipe <snipe@snipe.net>
 2023-01-23 21:37:35 -08:00
cram42 c2c009a018
Merge branch 'develop' into develop 2023-01-24 09:53:42 +08:00
Jeremy Price d3bcc48ae5 [imports] fix "Backup before importing?" checkbox on import page 
We were always taking backups before import, no matter the status of
this box.

Turns out we were testing for the presence of the property defined by
the checkbox, rather than the value of the property, and as such were
always doing a backup.

We're now checking the status, and it behaves as expected
 2023-01-23 15:08:59 -08:00
snipe 41537a2449 Added field to the API controller endpoints 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:56:44 -08:00
snipe cd8cb445ba Corrected fieldname for user fieldname for avatar in Controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:20:53 -08:00
snipe f77d871dff Use the imageHandler for profile avatar changes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:05:20 -08:00
snipe 60eab08735 Added ->with(‘users as users_count’) in Accessory query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:41:07 -08:00
snipe 378dc968b7 Derp. Copypasta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 15:44:28 -08:00
snipe 0c39c7a53d Updated blades to add byod as a “status” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:25:46 -08:00
snipe b80d52a9c3 Added byod to asset controller for create and update methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:03:51 -08:00
snipe ee4b8f4694 Added byod to API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:03:31 -08:00
Godfrey M 7ce230fadc missed a few renames 2023-01-18 08:57:59 -08:00
snipe dbda288a44 Formatting changes only for readability 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:21:20 -08:00
snipe eaf9332096 Added filterability to 2FA fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:21:03 -08:00
snipe 151719a91c Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:24:46 -08:00
snipe 825df2cf75 Load up the item counts with the individual API methods for accurate numbers without n+1 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:17:03 -08:00
snipe 529b005d1e We were previously returning a collection - this reverts the change in the last PR to keep that behavior consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 21:05:51 -08:00
snipe 7846251d25 Re-added return for no results (derp) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:43:57 -08:00
snipe cc665d50ed One more refactor, hopefully simplifying 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:40:12 -08:00
snipe ae76d46f87 Small refactor to ALWAYS return deleted assets in a collection transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:23:05 -08:00
snipe bf849128fc Replicate the response behavior in the bySerial endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 19:57:47 -08:00
snipe 44be8c8f60 Determine which transformer to use based on number of assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 19:54:21 -08:00
Ivan Nieto Vivanco 3a9b8a4993 Calculate the proper amount of people in the dashboard if Full Company Support is enabled 2022-12-20 18:39:17 -06:00
snipe 399c7590cd
Merge pull request #12209 from snipe/fixes/error_downloading_unaccepted_assets 
Fixed 500 when downloading the Unaccepted Assets report  [sc-19555]
 2022-12-15 14:19:41 -08:00
snipe 29c2ff56ec
Merge pull request #12188 from snipe/fixes/decrease_logging_for_saml_when_not_enabled 
Removed extra logging case that was very noisy
 2022-12-15 11:26:49 -08:00
snipe 227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group 
Adds a permission group selection for directory sync
 2022-12-15 11:06:53 -08:00
snipe 775df0ab60
Merge pull request #12221 from snipe/fixes/throttles_reset_password_form 
Add throttle for password reset form
 2022-12-08 14:51:22 -08:00
snipe f7da87520c
Merge pull request #12134 from Godmartinz/custom_report_user_fields_missing 
fixes a regression with the csv assigned to fields
 2022-12-07 16:18:32 -08:00
snipe c3a6874b16 Add throttle for password reset form 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-06 20:42:40 -08:00
Ivan Nieto Vivanco eb67d1b064 Filter items from the report if null returned 2022-12-06 18:00:16 -06:00
akemi 2f8a435e18 fixing curly quotes 2022-12-05 18:06:28 -05:00
akemi 55f5e7866d edits for PR 2022-11-29 15:59:36 -05:00
snipe 1fe0bfe17e Removed extra logging case that was very noisy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 19:27:42 -08:00
akemi 39e06a8856 Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated 2022-11-28 14:16:22 -05:00
Godfrey M a02a04d601 fixes a regression with the csv assigned to fields 2022-11-16 16:34:57 -08:00
snipe 489895a5fa Added comments and spacing for readability 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 17:48:28 +00:00
snipe 1122562b4e Handle use case where there are no custom fields for any assigned models 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 17:45:50 +00:00
snipe 5df76155ce Check for the format index in the $data array when creating a new custom field via API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 15:53:16 +00:00
Godfrey M 45636b8114 adds should_autoassign boolean to users table 2022-11-15 15:42:57 -08:00
snipe 6400bdc266
Merge pull request #12120 from snipe/features/added_deleted_filter_to_search_by_tag 
Added ability to include deleted items in tag search endpoint
 2022-11-15 17:54:34 +00:00
snipe ffd252a00c
Merge pull request #12119 from lukasfehling/feature/added-endpoint-for-user-notification 
Added: API endpoint to trigger a user email notification with their assigned assets
 2022-11-15 17:51:15 +00:00
snipe 7fcf6f2463 Removed deleted parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:47:21 +00:00
snipe 2c5a0d370c Clean up API byserial and bytag, allow deleted param 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:33:56 +00:00
snipe bcbe517446 Added ability to include deleted items in tag search endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:18:09 +00:00
lukasfehling d9a9bd1c0d Added a api endpoint for sending email notifications to users with their assigned assets 2022-11-15 18:17:51 +01:00
snipe 9a5d431962 Allow searching firectly for asset tag and serial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:13:26 +00:00
snipe 56c4fa7c27 Override display settings if field is encrypted 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:41:31 +00:00
snipe 1e34398c99 Permissions check on the field itself 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:19:12 +00:00
snipe 1fa624420e Removed unneeded relationships 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 16:46:49 +00:00
snipe 52dc5aa4ba Added field to controller and tranformer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:26:59 +00:00
snipe 04b6f023ae Use new upload string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:57:50 -07:00
snipe 3c7d63c060 Disallow uploads if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:52:23 -07:00
Cram42 36210f1c6a Allow settings to be overridden in request 2022-11-02 19:30:45 +08:00
Cram42 48fb4f2439 Add labels route for testing layouts 2022-11-02 17:23:52 +08:00
Cram42 a8b6a4a259 Allow passing "template" param 2022-11-02 16:04:40 +08:00
snipe eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
snipe 97aeb1fcec Use the generic file uploads strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:31:23 -07:00
snipe f1cb7ee410 Fixed some translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:28:39 -07:00
snipe 84c0f50266 Added ComponentFilesController 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:10:04 -07:00
snipe 2106b64da6 Fixed some layout issues 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:06:49 -07:00
snipe 25f69a7bd2 Added consumable methods for uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:52:28 -07:00
Cram42 6b2fe582ca Merge branch 'feature-label2' into develop 2022-11-01 20:12:28 +08:00
cram42 7e2546b31f
Merge branch 'snipe:develop' into develop 2022-11-01 20:04:59 +08:00
Cram42 7b29ddd283 Tie into tag generation 2022-11-01 20:02:12 +08:00
Cram42 6de48b4dc8 Implement settings for labels 2022-11-01 20:00:53 +08:00
Cram42 5558a005b9 Implement API for labels 2022-11-01 19:57:51 +08:00
snipe 7cb4740359
Merge pull request #11766 from snipe/fixes/wtf_method_names_derp 
Fixed (?) method name?
 2022-10-26 17:39:11 -07:00
Cram42 0e69e4248c Fix: Multiple outputs at hardware/{id}/label 2022-10-27 08:12:42 +08:00
snipe c1eee2cc72 Corrected string for invalid current password 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 12:18:29 -07:00
snipe 12c7223bcd Renamed column back to assets_count for legacy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 09:39:03 -07:00
snipe 28b0d8cf0f Null expected_checkin on user bulk checkin and delete 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:54:37 -07:00
snipe e670ffe349 Added Assets Assigned to tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:16:06 -07:00
snipe 4eed2baa31 Added default tab to locations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:06:58 -07:00
Godfrey M f2d4a61e3c removes dead space 2022-10-18 15:31:37 -07:00
Godfrey M 3f25a1bf61 removes dead code 2022-10-18 15:25:38 -07:00
Godfrey M f9ac447dd1 adds default group to LDAP 2022-10-18 15:18:09 -07:00
snipe 98f2e0271b
Merge pull request #11942 from nh314/develop 
Correct comparison logic
 2022-10-12 10:55:29 -07:00