5cd2c78d5e
Link to location view, not edit
2016-07-13 07:16:10 -07:00
ab6e2a7301
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-07-13 05:50:45 -07:00
e7038cfdc8
LDAP tester
2016-07-13 05:50:40 -07:00
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
bf88cd8233
Check for variables to exist and not null rather than assuming it does. Fixes #2247 . ( #2248 )
2016-07-12 21:03:23 -07:00
c8351ae01b
Reverting back to or die
2016-07-11 18:25:29 -07:00
7a4cbce460
Use trans instead of lang::
2016-07-10 21:07:59 -07:00
f87fbbdb1d
Removed unused use statement
2016-07-10 21:01:11 -07:00
4e38f96f97
Switched or and and to || and && for code quality
2016-07-10 20:55:44 -07:00
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
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
a9f060e768
Removed extraneous comments
2016-07-09 18:19:19 -07:00
9f4e0491ed
Fixes error in license checkout
2016-07-07 04:13:08 -07:00
f2ddc7b0ae
Added purchase cost and purchase date to listing
2016-07-07 02:07:21 -07:00
01b01c6479
Fixes #2149
2016-07-07 01:13:31 -07:00
0c98390eef
Hide bulk actions, checkbox and checkout/in if deleted
2016-06-29 04:19:37 -07:00
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
483bf1b309
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-06-28 12:19:19 -07:00
e4275bd3d3
Fixes status label inline creation
2016-06-28 12:19:05 -07:00
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
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
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
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
278be52f7b
Show the exception message if APP_DEBUG is enabled.
2016-06-27 23:54:45 -04:00
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
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
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
2867cd523d
Fixes #2192
2016-06-22 17:14:49 -07:00
0cf563ae5b
Show admin in maintenances
2016-06-22 17:04:47 -07:00
95beddf613
Use helper library for asset list
2016-06-22 16:58:36 -07:00
e5a5de6a0d
Just use inline validation instead of form request, since it's a one-off
2016-06-22 15:59:00 -07:00
0ca85f8a8a
Updates to components
2016-06-22 14:55:17 -07:00
4ed8ff5576
Formatting fixes for coding standards
2016-06-22 12:27:41 -07:00
f6d47887c4
Flash input on model validation errors when creating/editing assets.
2016-06-22 15:20:49 -04:00
b9f72a2afa
Flash errors to session on edit as well.
2016-06-22 12:55:09 -04:00
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
dcdc1a6e7b
Merge pull request #2185 from dmeltzer/slack-fixes
...
A few slack fixes
2016-06-21 15:45:22 -07:00
508e7acb54
Bump up memory for LDAP import of large number of users
2016-06-21 12:22:10 -07:00
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
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
87352470c0
Added sortable created_at to assets and users
2016-06-15 21:06:17 -07:00
6a277a5391
Added inheritance back into users/groups
2016-06-15 20:45:45 -07:00
464ecc7cc6
Moved group sync
2016-06-15 11:51:10 -07:00
2df71be321
No need to update the user again
2016-06-13 11:30:47 -07:00
2daed3c271
Fix for custom fields not saving
2016-06-10 16:36:46 -07:00
c1a3592059
Fixes #2130
2016-06-10 08:29:43 -07:00
e9605891f3
Merge upstream and fix changes.
2016-06-10 07:44:45 -05:00
9c4c91063f
Merge branch 'v3' into Fix-Asset-Creation-with-old-data
2016-06-10 07:35:30 -05:00
4e74c553bd
Fix editing of assets. This also uses the asset form request for validation.
2016-06-10 07:33:33 -05:00
9e8b76d348
Use updated $request->input methods for 5.2
2016-06-10 05:16:27 -07:00
