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
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
2daed3c271
Fix for custom fields not saving
2016-06-10 16:36:46 -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
51742d66df
Removed uneeded size array
2016-06-08 23:28:21 -07:00
cd9cca9c6b
Modify Helper::categoryList() to take a category type parameter.
...
This allows for centralizing the category fetching code more and fixes
an error in asset model viewing (#2118 ). Also add a few translated
strings and standardize on a base of 'Select a *' for the default value
in our lists.
2016-06-05 09:47:44 -05:00
3ddaa88694
Fix image processing when editing an existing asset. Also reenable the image scaling on the server, but boost limit to 800x800
2016-05-31 19:50:58 -05:00
fcc79456fd
Play with a mobile friendly capture-image-from device when adding an asset. This also involved rewriting the upload to be all ajaxy and stuff
2016-05-31 19:50:58 -05:00
004c63cd5d
Improve web imported. Show a list of all items with that were not imported correctly after import. Modify ObjectImporter and add a web-import parameter that causes it to spit out json errors exclusively. Long term I want to separate the console command and the logic so we aren't calling the console command directly, but rather a class that does everything. This would allow for easier progress reports and ajaxification.
2016-05-26 21:29:29 -05:00
715e385925
Two things. One, try to make the import uploads directory if it doesn't exist. Two, call the object importer instead of the old asset importer. TODO: Feed output from object importer back to import page.
2016-05-26 08:00:00 -05:00
780c0e678d
Changed min dimensions to 500 from 300
2016-05-24 13:21:18 -07:00
f844bf4b41
Nicer focus handling for asset search
2016-05-24 01:10:05 -07:00
fb35e40342
Search by asset tag
...
Compatible with barcode scanners
2016-05-20 17:02:28 -07:00
cbcc155f27
Settings tweaks
2016-05-19 19:49:25 -07:00
29e54830e1
Added 2D barcodes to labels
2016-05-19 19:12:42 -07:00
6d91774943
[Feature Request] Fixes #2030 - allow asset name change on checkin
2016-05-12 12:34:44 -07:00
ae8a03fec3
Add manufacturer name/sorting/searching on assets
2016-05-12 10:38:57 -07:00
ba01b20ad4
Use updated redirect() reference
2016-04-28 21:06:41 -07:00
3eb09871cf
Fixed model name
2016-04-23 03:12:39 -07:00
93e7715c28
Fixes dumb timestamp if the user manually removes date
2016-04-23 02:34:29 -07:00
7e0ab645bf
Removed junk text
2016-04-23 02:09:52 -07:00
4d4b4ffd36
Use new checkout/checkin method
2016-04-23 02:08:38 -07:00
466f660a63
Removed older commented out code
2016-04-23 02:08:18 -07:00
aa13b24bbc
Remove Parsefloat. Again.
2016-04-23 02:08:04 -07:00
44f7305e12
Fix restore assets
2016-04-21 21:01:57 -07:00
4efc30c63e
Escape search query text
2016-04-19 20:22:37 -07:00
78aa0cc378
Fixes #1918 - wrong link for status
2016-04-19 02:44:59 -07:00
bf728da39d
Updated to use 5.2 trans() instead of Lang::get for localization
2016-04-07 13:39:35 -07:00
a62859dc6d
Updated docblocks
2016-04-07 13:21:09 -07:00
6f9bad1005
Use lightbox for images in asset file listing
2016-03-25 20:38:27 -07:00
90d4a8b2e3
Cleanup namespaces a bit
2016-03-25 19:26:22 -07:00
95e2825716
A few more path fixes
2016-03-25 17:20:28 -07:00
bddb7fca23
Additional doc blocks, added private_uploads path
2016-03-25 15:50:08 -07:00
27543d16f6
Additional escaping
2016-03-25 15:24:12 -07:00
7ec109c4d8
Fixed slug helper
2016-03-25 03:32:35 -07:00
fe00b0e401
Version 3 - hold onto your butts
2016-03-25 01:18:05 -07:00
