Marcus Moore
|
d03baa4613
|
Make diff cleaner
|
2024-08-07 13:29:45 -07:00 |
|
Marcus Moore
|
41437e4d8f
|
Merge branch 'develop' into fixes/bulk-checkin-logging
# Conflicts:
# app/Http/Controllers/Users/BulkUsersController.php
|
2024-08-07 13:06:59 -07:00 |
|
snipe
|
9350a20189
|
Include accessories count
This isn’t exactly right right now
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:19:47 +01:00 |
|
snipe
|
889d5da71e
|
Check for accessories on bulk items
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:04:32 +01:00 |
|
snipe
|
5546ab08c2
|
Only delete user records in accessories_checkouts for bulk delete
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 19:53:18 +01:00 |
|
snipe
|
ef183f256c
|
Merge pull request #15242 from Godmartinz/shortcut_option
Fixed shortcuts to be optional now
|
2024-08-07 18:56:27 +01:00 |
|
Godfrey M
|
3a96e501cc
|
use old school input
|
2024-08-07 10:54:06 -07:00 |
|
Godfrey M
|
6b1784f2ee
|
makes shortcuts optional
|
2024-08-07 10:47:16 -07:00 |
|
snipe
|
1a872b1643
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-07 18:15:44 +01:00 |
|
snipe
|
deef9ad181
|
Merge pull request #15241 from snipe/partial_revert_for_checkout_accessories_to_non_user
Partial revert for checkout accessories to non user
|
2024-08-07 18:15:08 +01:00 |
|
snipe
|
0dc7e8b8dc
|
Temp removed other selector
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 18:04:52 +01:00 |
|
snipe
|
a5f075548a
|
Default to user
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 18:04:39 +01:00 |
|
Marcus Moore
|
a220986d16
|
Switch to snake case
|
2024-08-06 16:13:51 -07:00 |
|
Marcus Moore
|
2a8ac81eed
|
Fix namespace
|
2024-08-06 15:22:13 -07:00 |
|
snipe
|
766b370264
|
Merge pull request #15229 from marcusmoore/bug/sc-26552
Disallowed checking out components to different companies and fixed number remaining counts
|
2024-08-06 21:33:55 +01:00 |
|
snipe
|
da33277234
|
Merge pull request #15230 from marcusmoore/fixes/test-namespaces
Fixed handful of test namespaces
|
2024-08-06 21:32:11 +01:00 |
|
Marcus Moore
|
84e447af09
|
Fix test namespaces
|
2024-08-06 13:21:36 -07:00 |
|
Marcus Moore
|
c7ddabcc8b
|
Check for FMCS when checking out component
|
2024-08-06 12:27:15 -07:00 |
|
Marcus Moore
|
bee80fcf8a
|
Remove global scope when counting check outs
|
2024-08-06 12:16:06 -07:00 |
|
Marcus Moore
|
0aff35b622
|
Scaffold additional failed tests
|
2024-08-06 12:07:34 -07:00 |
|
Godfrey M
|
46a6a84ecb
|
adds migration and translations
|
2024-08-06 11:07:39 -07:00 |
|
Marcus Moore
|
374812f8fe
|
Add failing test
|
2024-08-06 10:48:38 -07:00 |
|
Marcus Moore
|
94e00b8a3e
|
Use new accessory checkout relationship
|
2024-08-05 17:26:11 -07:00 |
|
Marcus Moore
|
f2b78d18a4
|
Merge branch 'develop' into fixes/bulk-checkin-logging
# Conflicts:
# app/Http/Controllers/Users/BulkUsersController.php
|
2024-08-05 17:25:54 -07:00 |
|
Marcus Moore
|
17eccfcd8b
|
Formatting
|
2024-08-05 16:58:27 -07:00 |
|
Marcus Moore
|
01e4382d20
|
Formatting
|
2024-08-05 16:58:17 -07:00 |
|
Marcus Moore
|
1c664af326
|
Remove todo outside of scope
|
2024-08-05 16:58:08 -07:00 |
|
Marcus Moore
|
392d34422a
|
Remove code handled by ConsumableAssignment:: call above
|
2024-08-05 16:57:40 -07:00 |
|
Marcus Moore
|
35e7a3163c
|
Implement test case
|
2024-08-05 16:54:31 -07:00 |
|
Marcus Moore
|
96fafa6952
|
Improve readability
|
2024-08-05 16:36:29 -07:00 |
|
Marcus Moore
|
a55693211f
|
Move test class
|
2024-08-05 16:27:04 -07:00 |
|
Marcus Moore
|
1acd24fdbe
|
Re-order helpers
|
2024-08-05 16:26:25 -07:00 |
|
Marcus Moore
|
59b7d5db4b
|
Remove comment
|
2024-08-05 16:25:14 -07:00 |
|
Marcus Moore
|
16aa47509b
|
Implement test for assets
|
2024-08-05 16:24:52 -07:00 |
|
Marcus Moore
|
d1bb3ef6bf
|
Scaffold two tests
|
2024-08-05 16:19:09 -07:00 |
|
Marcus Moore
|
5cd9dd4a67
|
Add assertion to ensure user cannot perform bulk actions on self
|
2024-08-05 16:17:24 -07:00 |
|
Marcus Moore
|
fc405d9d73
|
Assert redirected to correct place
|
2024-08-05 16:14:01 -07:00 |
|
Marcus Moore
|
5786ff5035
|
Add assertion for success message
|
2024-08-05 16:11:07 -07:00 |
|
Marcus Moore
|
8a206a6d92
|
Add assertion
|
2024-08-05 16:10:12 -07:00 |
|
Marcus Moore
|
67b3ab820f
|
Add todo comments
|
2024-08-05 16:10:08 -07:00 |
|
Marcus Moore
|
b06501dd02
|
Add assertions
|
2024-08-05 16:02:59 -07:00 |
|
Marcus Moore
|
e3049fffd4
|
Remove comment
|
2024-08-05 15:50:53 -07:00 |
|
Marcus Moore
|
5ecdb7e07c
|
Add validation test
|
2024-08-05 15:50:09 -07:00 |
|
Marcus Moore
|
4ed3347f52
|
Add permission check
|
2024-08-05 15:43:38 -07:00 |
|
Marcus Moore
|
364775dcfe
|
Improve readability
|
2024-08-05 15:42:03 -07:00 |
|
Marcus Moore
|
bfebcdc7ed
|
Improve variable name
|
2024-08-05 15:22:35 -07:00 |
|
Marcus Moore
|
480e4f3a69
|
Improve readability
|
2024-08-05 15:16:40 -07:00 |
|
Marcus Moore
|
78a0417ee9
|
Add another user into the mix
|
2024-08-05 15:11:18 -07:00 |
|
snipe
|
b83d148b37
|
Merge pull request #15217 from TelecomsSansFrontieres/feature_extend-search-by-tag
Feature: Extend search capabilities to other assets attributes
|
2024-08-05 15:38:51 +01:00 |
|
Florent Bervas
|
ad794248fe
|
add a warning message if asset tag not found
|
2024-08-05 13:54:33 +00:00 |
|