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
a0901247a3
Let superadmins through companyable trait
2016-06-10 04:07:27 -07:00
02a9394cd9
Merge remote-tracking branch 'origin/v3' into v3-master
2016-06-10 03:41:03 -07:00
ec4bc6c2af
Allow superadmins to print labels
2016-06-10 03:40:49 -07:00
f44d98924d
Removed erroneous call to nonexistent model
2016-06-09 14:42:13 -07:00
c91c1f92cd
Fixes #2132
2016-06-09 13:27:50 -07:00
845b182fdf
Fixes format for users in category view
2016-06-09 02:26:43 -07:00
2b5fb04ba9
Allow admin to add user on checkout screen
2016-06-09 00:36:52 -07:00
bb758d618b
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-06-08 23:28:53 -07:00
51742d66df
Removed uneeded size array
2016-06-08 23:28:21 -07:00
9648c6f1d3
Fix license Checkout.
...
A mistake in the sqlite porting led to "Please select an asset"
disappearing. This centralizes that code in Helper, and uses the code
in Licensescontroller and componentscontroller.
Also use the proper name on the components checkout page.
AssetMaintencesController reuses the same underlying code as
licensescontroller, but we don't want "Please select an asset" to be an
option there, so I'm not changing that code.
2016-06-07 07:58:08 -05:00
75eb2bbe09
Janky-ass form request stuff
2016-06-06 21:02:06 -07:00
d4e231d5d4
Save permissions on new user
2016-06-06 18:56:43 -07:00
75dfb87671
Use form request for user add/edit to handle password and password confirmation
2016-06-06 14:15:50 -07:00
23936e465d
Merge pull request #2123 from dmeltzer/fix-setup-on-windows
...
Fix missing posix_getpwuid on windows.
2016-06-06 12:31:30 -07:00
21506f4101
Merge pull request #2120 from dmeltzer/add-clone-to-models-index
...
Add clone action to Assetmodels index page.
2016-06-06 12:29:54 -07:00
ea3e11e011
Fix missing posix_getpwuid on windows.
...
This isn't a perfect solution. It basically just nullifies the check on
windows. I'm not sure if IIS can run as a nonelevated user though, so
perhaps thats the best choice. Regardless, this fixes the setup.
2016-06-06 07:43:05 -05:00
a89511674b
Add clone icon to Assetmodels index page.
2016-06-05 10:00:31 -05:00
