snipe
8d71e6b268
Fixed indenting
2016-07-09 18:20:57 -07:00
snipe
7ff77981f6
Fixed indenting
2016-07-09 18:19:51 -07:00
snipe
a9f060e768
Removed extraneous comments
2016-07-09 18:19:19 -07:00
snipe
9f4e0491ed
Fixes error in license checkout
2016-07-07 04:13:08 -07:00
snipe
f2ddc7b0ae
Added purchase cost and purchase date to listing
2016-07-07 02:07:21 -07:00
snipe
01b01c6479
Fixes #2149
2016-07-07 01:13:31 -07:00
snipe
3bb5479efd
Move print statement to LOG
2016-07-01 16:24:58 -07:00
snipe
0c98390eef
Hide bulk actions, checkbox and checkout/in if deleted
2016-06-29 04:19:37 -07:00
snipe
6d5bc64b2b
Another fix for status label types
...
This is a little janky, as it breaks up the errors into multiple screens if you don't have a status label type AND don't have a name. This is because the model-level validation won't work since we transmogrify that dropdown list of status label types into boolean values for the DB. Should eventually find a less clunky way to handle this, but needed to get a fix in now.
2016-06-28 14:52:11 -07:00
snipe
6633366b29
Small fix for status label types
2016-06-28 12:40:20 -07:00
snipe
483bf1b309
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-06-28 12:19:19 -07:00
snipe
0e96a0aa3e
Updated comment
2016-06-28 12:19:14 -07:00
snipe
e4275bd3d3
Fixes status label inline creation
2016-06-28 12:19:05 -07:00
Daniel Meltzer
d484636bba
Add model number column to the hardware list. ( #2204 )
...
* Add model number column to the hardware list and allow searching based on model number. Column is hidden by default.
* Fix sorting. Add scope to order by model number.
2016-06-27 22:32:40 -07:00
snipe
82d19fc704
Merge pull request #2201 from dmeltzer/fix-user-creation-values
...
UserController::postCreate - Store all request information.
2016-06-27 21:12:49 -07:00
Daniel Meltzer
b1c28d7965
Move checks back into methods instead of having an extra helper method. Also remove unnecessary lock_passwords checks because there is a check at the top of the method that does this already.
2016-06-28 00:11:59 -04:00
snipe
6ea74f9fc3
Merge pull request #2203 from dmeltzer/display-error-if-import-upload-fails
...
If the move of the uploaded import file fails, return an error message.
2016-06-27 20:55:51 -07:00
Daniel Meltzer
278be52f7b
Show the exception message if APP_DEBUG is enabled.
2016-06-27 23:54:45 -04:00
Daniel Meltzer
ee1f983114
If the move of the uploaded import file fails, return a message. Fixes an issue reported on gitter today where bad permissions on the upload directory didn't provide any feedback.
2016-06-27 23:37:15 -04:00
snipe
e3fe80e2a5
Merge pull request #2202 from dmeltzer/sqlite-fix-asset-edit
...
Fix integrity constraint violation on sqlite.
2016-06-27 20:20:01 -07:00
Daniel Meltzer
d3b035cfe9
Fix integrity constraint violation on sqlite.
...
If the requestable checkbox was not checked, it did not exist in the request.
Setting requestable to null in such a case would cause a violation because it should be 0/1.
Also fix a copy/paste where we reset requestable after checking for rtd_location_id.
2016-06-27 23:16:03 -04:00
Daniel Meltzer
cf29a4a319
Extract common data from UserController postCreate and postEdit into a helper method. Use this method to store data about user. Fixes #2200
2016-06-27 22:48:09 -04:00
Daniel Meltzer
5bc52a9425
Link to user on asset checkout as well as checkin.
2016-06-23 09:39:50 -04:00
snipe
2867cd523d
Fixes #2192
2016-06-22 17:14:49 -07:00
snipe
0cf563ae5b
Show admin in maintenances
2016-06-22 17:04:47 -07:00
snipe
95beddf613
Use helper library for asset list
2016-06-22 16:58:36 -07:00
snipe
e5a5de6a0d
Just use inline validation instead of form request, since it's a one-off
2016-06-22 15:59:00 -07:00
snipe
0ca85f8a8a
Updates to components
2016-06-22 14:55:17 -07:00
Daniel Meltzer
25b916afeb
Show the name of the item with errors in the table.
2016-06-22 17:09:04 -04:00
snipe
f753783ca0
Smaller miminums for model and category name
2016-06-22 12:50:21 -07:00
snipe
4ed8ff5576
Formatting fixes for coding standards
2016-06-22 12:27:41 -07:00
snipe
70aefdc9c0
Merge pull request #2190 from dmeltzer/fix-asset-creation
...
Flash input on model validation errors when creating/editing assets.
2016-06-22 12:23:13 -07:00
Daniel Meltzer
f6d47887c4
Flash input on model validation errors when creating/editing assets.
2016-06-22 15:20:49 -04:00
snipe
8942e085c3
Merge pull request #2189 from dmeltzer/importer-improvements
...
Two more importer fixes.
2016-06-22 12:20:13 -07:00
snipe
3470fd57ef
Merge pull request #2188 from dmeltzer/paveit-syntax-fix
...
Add a space to the signature to make the --soft option work.
2016-06-22 12:16:25 -07:00
Daniel Meltzer
eba6574047
Add a space to the signature to make the --soft option work.
2016-06-22 15:13:43 -04:00
Daniel Meltzer
43e64a5f8c
Store a list of errors associated with each field instead of overwriting the error if multiple occur. Also Adjust the importer to extract the asset tag earlier in the process so all asset related errors are associated with the asset tag rather than some being tied to the name.
2016-06-22 15:13:01 -04:00
Daniel Meltzer
b9f72a2afa
Flash errors to session on edit as well.
2016-06-22 12:55:09 -04:00
Daniel Meltzer
560115e758
If we survive form request validation but fail model validation, ensure that the errors are actually flashed to the session. Another thing that will be better fixed in the future when handling json nicer.
2016-06-22 12:55:09 -04:00
snipe
dcdc1a6e7b
Merge pull request #2185 from dmeltzer/slack-fixes
...
A few slack fixes
2016-06-21 15:45:22 -07:00
snipe
508e7acb54
Bump up memory for LDAP import of large number of users
2016-06-21 12:22:10 -07:00
snipe
49bf9f8b5b
Switch null to lowercase for code style adherence
2016-06-21 11:06:53 -07:00
snipe
afc3cfa16a
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-06-21 10:06:19 -07:00
snipe
37d22d6d21
Merge remote-tracking branch 'origin/v3-master' into v3
2016-06-21 10:03:45 -07:00
Daniel Meltzer
f004facb06
A few slack fixes
...
1) Missing $admin_user in AccessoriesController::postCheckout(). Fixes #2183
2) AssetsController::postCheckin used the hardware url for the user link, not the user url
2016-06-21 09:43:32 -04:00
Daniel Meltzer
d6dd449445
Only show importer progress if on command line. It broke error display from web.
2016-06-20 00:09:17 -04:00
Daniel Meltzer
8c00bad6d0
Add a check to ensure custom fields exist before iterating through them
2016-06-20 00:09:17 -04:00
Daniel Meltzer
4715cc6447
Pass user id to importer. This shows items imported through web interface as created by the appropriate user. Also save warranty_months to item, not just read it from csv. Fixes #2175
2016-06-20 00:09:17 -04:00
Daniel Meltzer
5a45ec708b
Use the model validation trait to validate asset maintences. Might be better to add a form request as well, but this at least makes the model validation occur. fixes #2170
2016-06-16 22:22:07 -04:00
Nikolai Prokoschenko
8d03668d78
Fix reverse proxy support
...
Reintroducing trusted proxies via fideloper/proxy:
* Upgraded fideloper/proxy to 3.1
* Added fideloper/proxy to Http/Kernel.php
* Added fideloper/proxy to config/app.php
* Added environment variable APP_TRUSTED_PROXIES to env (with '*' being the default fallback)
2016-06-16 15:43:42 +02:00
