snipe
345662c5c2
Rearrange some of the user creation logic
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 16:34:10 -07:00
snipe
aedfef78d3
Update app/Importer/LocationImporter.php
...
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
2023-04-18 13:26:23 -07:00
Marcus Moore
508660b1df
Skip notifications for component checkouts and checkins
2023-04-18 13:07:55 -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
41490f1e3a
Use “name” instead of “license” for consistency
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 02:43:59 -07:00
snipe
9da36833be
Removed unused method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 02:43:44 -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
e84ba0c7a0
Revert back to old method name
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 02:06:32 -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
de78f8d41f
Renamed/refactorered licenses method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 01:01:44 -07:00
snipe
6ab4314221
Removed unused method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 01:01:13 -07:00
snipe
087f0e596a
Fixed has to where
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-17 22:44:05 -07:00
Marcus Moore
2d56675ade
Merge branch 'develop' into bug/sc-15034
...
# Conflicts:
# database/factories/SettingFactory.php
2023-04-17 17:22:55 -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
snipe
b22cad9ced
Merge pull request #12855 from koelle25/fixes/last_component_checkout
...
Allow checkout of available components down to zero stock (fixes #12854 )
2023-04-17 09:49:14 -07:00
snipe
e0c53d8d09
Remove start/end dates form casts array
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-17 09:33:31 -07: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
0afaaa4a6b
Added autoassign_licenses option to create admin
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 15:28:08 -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
f40bef8f9b
Added autoassign_licenses to user importer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 15:25:08 -07:00
snipe
6acce098c9
Added autoassign_licenses on user model
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 15:24:56 -07:00
snipe
73cf62e060
Added autoassign_licenses to presenter
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 15:24:00 -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
144a6f28ec
Added intval
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 08:54:23 -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
a831a34594
New field mapping
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 07:47:26 -07:00
snipe
bcf9188dcd
Made default password longer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 07:47:19 -07:00
snipe
c149885ceb
Skip the magical user creation if it’s a location
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 07:47:04 -07:00
snipe
1509672463
Added location importer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 07:46:36 -07:00
snipe
bceb0b8a47
Allowed slightly longer zip codes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 07:46:29 -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
snipe
6097d534e9
Added eloquent model relationships
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-13 11:10:16 -07:00
snipe
3aac8bccd2
Added presenters for suppliers
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-13 11:09:59 -07: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
74babfa081
Added maxlength="10"
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-12 08:26:36 -07:00
snipe
04f83d34ff
Added withInput to carry over older fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-12 08:25:03 -07:00
snipe
d3d464e179
Improved commenting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-12 04:36:05 -07:00
snipe
afd01869a5
Check for Carbon exception
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-11 23:35:41 -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
snipe
9af2d0a6de
Merge branch 'develop' into features/replace_icheck_with_only_css
2023-04-05 13:04:12 -07:00
Marcus Moore
3054d633b0
Improve comments and remove unused imports
2023-04-05 12:39:41 -07:00
Marcus Moore
3cc3662992
Send webhook notifications for accessory checkins when enabled
2023-04-05 12:36:24 -07:00
Marcus Moore
6df8f0f35c
Merge branch 'develop' into bug/sc-15034
2023-04-05 11:49:53 -07:00
Godfrey M
b038fe8f2e
adds unavailable message to overcheckout
2023-04-05 10:00:39 -07:00
snipe
ead5293ee0
Merge pull request #12765 from spencerrlongg/chore/sc-20230
...
Change protected $dates to casts
2023-04-04 01:29:24 -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
Marcus Moore
621d8500eb
Merge branch 'develop' into bug/sc-15034
2023-03-30 16:17:42 -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
snipe
9ca5285781
Merge pull request #12762 from spencerrlongg/feature/sc-20304
...
Bulk Restore from Deleted
2023-03-30 12:37:50 -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
slong753
8c1c0e81b6
rm deplicates
2023-03-30 13:31:58 -05:00
snipe
10c1e923dc
Merge pull request #12764 from marcusmoore/fixes/importer-fix
...
Fixes potential unwanted overwrites in asset imports
2023-03-30 09:40:58 -07:00
slong753
e126a75f7a
pretty sure this was it
2023-03-29 21:37:26 -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
Marcus Moore
0998c70a92
Remove unneeded import
2023-03-29 16:59:26 -07:00
Marcus Moore
9f8b8f6cc1
Remove unneeded variable
2023-03-29 16:58:55 -07: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
Marcus Moore
e05546d1fa
Display helpful messages when importing assets
2023-03-29 13:23:45 -07:00
Marcus Moore
4cbe683a1a
Explicitly cast asset tag to string when querying
2023-03-29 11:28:04 -07:00
Dominik Both
3271c9dc9f
Fix #8208 , #8896 , #8985 , #9789
2023-03-29 09:56:34 +02: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
feef06e7bf
Changed log level to debug vs info/error
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-28 06:54:41 -07:00
Marcus Moore
362d5b9fd4
Merge branch 'develop' into bug/sc-15034
2023-03-27 11:46:30 -07:00
snipe
4d1e28ad03
Merge pull request #12727 from snipe/fixes/add_json_to_mimes
...
Fixed #12641 - added JSON to mimes
2023-03-24 07:22:30 -07:00
snipe
150a2b572e
Use single “accessory” translation
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-24 07:14:02 -07:00
snipe
6bc0df73e8
Merge pull request #12661 from Godmartinz/gh12655_missing_translations
...
Adds translations for category types to index and edit of categories
2023-03-24 07:09:40 -07:00
snipe
16dcc2d3ed
Fixed #12641 - add JSON to mimes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-24 06:57:43 -07: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
642d1e9f36
Merge pull request #12720 from inietov/fixes/undefined_array_key_266
...
Fixed Undefined array key 266 rollbar 17086
2023-03-24 04:50:47 -07:00
Marcus Moore
fa69a580ab
Start to scaffold license checkout notification test
2023-03-23 17:18:33 -07:00
Marcus Moore
fc043a35d9
Fix checkouts for licenses
2023-03-23 17:03:48 -07:00
Marcus Moore
2dcf4e3d16
Standardize on sending anonymous notifications for asset checkouts
2023-03-23 16:31:40 -07:00
Marcus Moore
1f664709ba
Merge branch 'develop' into bug/sc-15034
...
# Conflicts:
# app/Notifications/CheckoutAssetNotification.php
2023-03-23 13:04:40 -07:00
Ivan Nieto Vivanco
fbb3684022
Add a condition to 'restart' the color index for the status pie chart
2023-03-23 12:43:02 -06:00
Marcus Moore
fe6295a5e4
Update slack_* properties to webhook_*
2023-03-22 14:43:00 -07:00
Marcus Moore
9c4a3ce56a
Update slack_endpoint to webhook_endpoint in test and notification
2023-03-22 12:27:36 -07:00
Marcus Moore
f6d0dd0f93
Merge branch 'develop' into bug/sc-15034
2023-03-22 11:58:47 -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
Brady Wetherington
6fe520a55d
Hooked various the contents of the components together
2023-03-21 22:26:32 -07:00
snipe
41eb2464e2
Forgot the static method declaration - derp
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 21:21:01 -07:00
snipe
e40762cf7f
Small anal-retentive spacing/indenting tweaks
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 21:00:43 -07:00
snipe
637438ccf6
Added select2 to slack settings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 20:00:11 -07:00
snipe
647f47cdfe
Check for demo mode in the clear method for the controller
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 19:27:05 -07:00
snipe
a14d1b981d
Switched singleton to static helper method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 19:22:18 -07:00
snipe
5217141dfb
Yuck, but added helper function to return the demo mode form warning
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 18:59:34 -07:00
snipe
b28a25f544
Normalize the flash session to the way we do it elsewhere
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 18:59:18 -07:00
snipe
d55ae44638
Helper method to make it easier (shorter) to determine if the app is in demo mode
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 18:59:03 -07:00
Marcus Moore
315f5231cd
Send slack notification for check outs to assets and locations
2023-03-21 17:03:51 -07:00
snipe
35bef6625a
Merge pull request #12703 from Godmartinz/webhook_clean_up
...
adds clear and save button, save button updates accordingly
2023-03-21 17:02:33 -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
Godfrey M
3c28242a2e
save button updates accordingly
2023-03-21 15:53:09 -07:00
snipe
ecb11c3a12
Fixed #12682 - add default location to maintenance report
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 13:52:21 -07:00
snipe
4f8542b71b
Merge pull request #12680 from akemidx/clone_accessories
...
Clone accessories
2023-03-21 13:37:04 -07:00
akemidx
3134279a95
small edits
2023-03-21 15:48:53 -04:00
Brady Wetherington
704a2ad858
WIP: trying to merge two LW components into one, not working yet
2023-03-18 20:31:56 -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
12a2d8ad49
Fixed admin ID
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-17 17:03:10 -07:00
snipe
e47fc9527b
Updated language
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-17 16:50:02 -07:00
snipe
b39fa1d987
Added merge icon
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-17 16:42:17 -07:00
snipe
a54e50961e
Added event and listener
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-17 16:41:33 -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
8f04342fc2
Added console command to normalize capitalization on names
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-16 16:23:52 -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
Godfrey M
371e142bae
removes unnecessary function
2023-03-15 15:57:45 -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
a0617edaf0
Fixed missing variable in Slack hook test
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-14 19:02:38 -07: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
Godfrey M
1bd37b49e9
adds translations for webhook names
2023-03-13 16:13:02 -07:00
Ivan Nieto Vivanco
d224f3177e
Delete a rule that was breaking validation
2023-03-13 16:43:10 -06:00
Godfrey M
6474249ea8
uppercased names
2023-03-13 15:29:53 -07:00
Godfrey M
7612c5d852
lowercases variables
2023-03-13 15:26:51 -07: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
Godfrey M
576b8f8c48
adds translations to edit and index of categories
2023-03-13 13:33:03 -07:00
Godfrey M
542332ea0c
removes discord from rules
2023-03-13 10:54:18 -07:00
Godfrey M
27a2ed5c79
Merge branch 'develop' into generalize_webhooks
2023-03-13 10:41:08 -07:00
snipe
88eb73d160
Use Carbon’s diffForHumans() method instead of our own home-grown stuff
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 16:47:54 -08:00
snipe
f4bd307421
Added comments, removed gthe AgeFormat() helper method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 16:47:27 -08:00
snipe
059ead5af5
Added comments (not related to this, sorry)
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 16:47:08 -08:00
snipe
02dd0669dc
Added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 16:36:08 -08:00
snipe
b3b9efbaff
New helper method to return icon type
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 16:34:04 -08:00
Brady Wetherington
087fe19ae7
Merge branch 'livewire_importer_2_squashed_and_rebased' of github.com:uberbrady/snipe-it into livewire_importer_2_squashed_and_rebased
2023-03-08 13:57:21 -08:00
Brady Wetherington
22d7d2a04e
Aliases could get selected when they weren't for an import_type
2023-03-08 13:56:29 -08:00
snipe
b8887bd3e3
Translated strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 13:47:56 -08:00
snipe
65c2d75c04
Added aliases
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 13:47:38 -08: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
Godfrey M
15c19a7ab7
silenced Discord option and validation, more translations
2023-03-08 10:35:45 -08:00
snipe
094859cfe8
Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased
2023-03-07 21:38:04 -08:00
Brady Wetherington
037489a6c0
If fields were already mapped, they would cause a 500 on re-mapping on import
2023-03-07 21:33:20 -08:00
snipe
1ccedf6426
Merge pull request #12617 from kenchan0130/patch-12249
...
Fixed #12249 : fix csv importer for serial_number field
2023-03-07 19:42:23 -08:00
Brady Wetherington
942bedaf06
Re-add VIP and BYOD to importer, but in Livewire
2023-03-07 18:53:32 -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
Brady Wetherington
fe699737eb
Add improved field-guessing logic; make sure 'do not map' fields work
2023-03-07 18:26:59 -08:00
Godfrey M
69944853f9
more translations
2023-03-07 15:57:58 -08:00
snipe
45b5a8b6ab
Catch exception if the file can’t be handled via Intervention
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 15:56:36 -08:00
Godfrey M
35dd0d8def
adds generalized webhooks, updates settings page, translations, validation
2023-03-07 15:48:21 -08:00
snipe
ea54f540de
Dynamically determine target route for expected checkin emails
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 13:42:51 -08:00
akemidx
ec5836dab4
cloning accessories first bit
2023-03-07 16:41:48 -05:00
Marcus Moore
c80595e05c
Ensure asset name is maintained when importing assets that are checked out
2023-03-07 11:09:25 -08:00
Tadayuki Onishi
f4675927a0
fix csv importer for serial_number filed
...
Signed-off-by: Tadayuki Onishi <tt.tanishi100@gmail.com>
2023-03-07 22:53:02 +09: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
a34cb8b862
Check for boolean on requestable
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-06 17:11:08 -08:00
snipe
0d3388b3ae
Merge pull request #12623 from snipe/bug/sc-20254/errorexception-filesize-stat-failed-for-snipe
...
Check that the file exists before trying to stat it for filesize
2023-03-06 15:43:17 -08:00
snipe
fffe5da2e0
Merge pull request #12625 from uberbrady/quiet_down_scim_exceptions
...
Suppress SCIMExceptions from cluttering up Rollbar
2023-03-06 15:42:58 -08:00
Brady Wetherington
dd3c3a1428
Suppress SCIMExceptions from cluttering up Rollbar
2023-03-06 15:24:16 -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
b46c455e0a
Updated mappings.md with byod and vip fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-06 14:28:34 -08:00
snipe
304ccaa30e
Added byod to asset importer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-06 14:28:24 -08:00
snipe
f672bdd3b7
Added vip to user importer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-06 14:28:14 -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
Godfrey M
e5deb4b413
doesn't allow months to be zero
2023-03-06 09:41:14 -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
Godfrey M
aae178a606
gets select working, placeholders update dynamically
2023-03-01 17:10:10 -08: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
Godfrey M
354f04534e
add multi array, migration, still having issues
2023-03-01 12:30:32 -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
Brady Wetherington
c48e19d236
Whoops, went a little overboard there. Whoopsie!
2023-02-28 22:51:48 -08:00
Brady Wetherington
f3c500014c
Another file I didn't really need to commit
2023-02-28 22:37:16 -08:00
Brady Wetherington
4f8710db63
Whoops, mis-committed something here that doesn't belong
2023-02-28 22:36:26 -08:00
Brady Wetherington
54cb38603b
Cleaned up the last of the FIXME's (or downgraded them to TODO's)
2023-02-28 22:34:44 -08:00
Brady Wetherington
5cf66851f7
Finalizing the Livewire Importer! Just going to do some testing now
2023-02-28 21:58:02 -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
snipe
2ab0abc8a1
Merge pull request #12575 from inietov/fixes/typeError_get_class_argument_must_be_object_null_given
...
Fixed: TypeError: get_class(): Argument #1 ($object) must be of type object, null given
2023-02-28 16:45:53 -08:00
Ivan Nieto Vivanco
ad598425ef
Adds format to the dates cast
2023-02-28 17:24:14 -06:00
Ivan Nieto Vivanco
1be0a8d911
Declare variable as an empty array
2023-02-28 10:22:49 -06:00
Ivan Nieto Vivanco
0d860c0b72
Check if target is not null to retrieve the proper data
2023-02-27 19:01:37 -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
Ivan Nieto Vivanco
b4e578c95e
Convert the alert_email setting from string to array
2023-02-27 17:34:29 -06:00
Brady Wetherington
53db266b69
WIP: cleaning up extraneous gunk and trying to standardize on one single Livewire Select2 implementation
2023-02-27 14:29:02 -08:00
Brady Wetherington
fb201e61f3
More wiring up Livewire to the back-end.
2023-02-27 14:29:02 -08:00
Brady Wetherington
e1c8f155bb
Wiring up more bits to Livewire
2023-02-27 14:29:02 -08:00
Brady Wetherington
8009ee79db
I think I have, now, full parity on the base Importer level
...
Meaning that you can upload new files, delete old files, have error
messages, have status updates - and all of them seem to work.
2023-02-27 14:29:02 -08: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
c7106a1df2
Added table aliases to fix ambiguous SQL clause
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-27 13:24:09 -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
Godfrey M
e8fc895e51
"adds variables, but still not working"
2023-02-27 09:19:59 -08:00
snipe
cb0b234b80
Merge pull request #12561 from inietov/fixes/unable_to_import_purchase_date
...
Fixed #12559 Unable to import Purchase Date field
2023-02-24 10:02:25 -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
Ivan Nieto Vivanco
51efd9b413
Adjust the date format for purchase_date field
2023-02-24 10:59:31 -06:00
Ivan Nieto Vivanco
6bd72125bd
Deletes problematic cast
2023-02-23 22:31:41 -06: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
snipe
5a1e5f740d
Merge pull request #12537 from inietov/fixes/expected_checkin_date_validation
...
Fixed #12531 Expected Checkin Date on Asset Checkout throws an error
2023-02-22 16:03:51 -08:00