snipe
e7038cfdc8
LDAP tester
2016-07-13 05:50:40 -07:00
snipe
4233c781ac
Reworked LDAP login. Fixes #2218
...
LDAP no longer fails completely when the connection settings are wrong, or when app key is messed up. Rather than auth as the admin user and search, we auth as the user themselves. Admin auth is only for LDAP sync now.
This should mean much fewer problems with donked LDAP settings and login.
2016-07-13 05:50:24 -07:00
snipe
b5d3843b7c
New LDAP model
2016-07-13 05:48:16 -07:00
snipe
026f099ba3
Fixed indenting
2016-07-13 05:47:32 -07:00
snipe
c8351ae01b
Reverting back to or die
2016-07-11 18:25:29 -07:00
snipe
7a4cbce460
Use trans instead of lang::
2016-07-10 21:07:59 -07:00
snipe
3f835ba847
Updated lang to trans
2016-07-10 21:04:49 -07:00
snipe
f87fbbdb1d
Removed unused use statement
2016-07-10 21:01:11 -07:00
snipe
4e38f96f97
Switched or and and to || and && for code quality
2016-07-10 20:55:44 -07:00
Daniel Meltzer
ab3b9dcf5d
Add a clone button the the user table. ( #2241 )
...
Also preserve permissions when cloning a user, instead of nulling them by default.
2016-07-10 18:43:10 -07:00
Daniel Meltzer
f683c78a69
Fix adding an image to an asset when public/uploads/assets does not exist ( #2240 )
...
* Fix adding an image to an asset when public/uploads/assets does not exist.
First check to see if we can create directory and do so. If any errors occur, display the error string as an error on the page.
* Add the public/uploads/assets directory to new installs.
* Add some comments explaining this code so I remember what it does next time.
2016-07-10 18:43:00 -07:00
snipe
642be61007
Remove old asset importer
2016-07-09 19:35:42 -07:00
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
