zjean
fcb1d6ac15
Fixed feedback on #2349 ( #2359 )
2016-07-29 13:59:50 -07:00
Daniel Meltzer
eef8d1609e
Small fixes ( #2350 )
...
* components.view should point to view, not create
* Fix comment
* Rename variable to accurately reflect its responsibility
* Fix line breaks in serial key, remove places where adding line breaks makes no sense. Fixes #2344
2016-07-28 20:59:42 -07:00
snipe
68b7b8f932
Fixes Carbon date
2016-07-28 08:51:01 -07:00
snipe
f53c5706f6
Fixes #2341
2016-07-28 07:36:58 -07:00
Daniel Meltzer
e0938cf82d
Scope to company when viewing assets ( #2315 )
...
* If a user doesn't belong to a company, when scoping to a company we should only show items that don't belong to a company.
* Scope tables/items to the company they belong to when fetching items for the index.
* Fix asset count to also scope to company. This fixes dashboard view
* Exempt super users from the child company check to be consistent. Fixes license count on dashboard now that we scope everything
2016-07-25 19:46:29 -07:00
snipe
5cd2c78d5e
Link to location view, not edit
2016-07-13 07:16: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
f2ddc7b0ae
Added purchase cost and purchase date to listing
2016-07-07 02:07:21 -07:00
snipe
0c98390eef
Hide bulk actions, checkbox and checkout/in if deleted
2016-06-29 04:19:37 -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
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
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
snipe
4ed8ff5576
Formatting fixes for coding standards
2016-06-22 12:27:41 -07:00
Daniel Meltzer
f6d47887c4
Flash input on model validation errors when creating/editing assets.
2016-06-22 15:20:49 -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
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
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
snipe
87352470c0
Added sortable created_at to assets and users
2016-06-15 21:06:17 -07:00
snipe
2daed3c271
Fix for custom fields not saving
2016-06-10 16:36:46 -07:00
Daniel Meltzer
e9605891f3
Merge upstream and fix changes.
2016-06-10 07:44:45 -05:00
Daniel Meltzer
9c4c91063f
Merge branch 'v3' into Fix-Asset-Creation-with-old-data
2016-06-10 07:35:30 -05:00
Daniel Meltzer
4e74c553bd
Fix editing of assets. This also uses the asset form request for validation.
2016-06-10 07:33:33 -05:00
snipe
9e8b76d348
Use updated $request->input methods for 5.2
2016-06-10 05:16:27 -07:00
snipe
a0901247a3
Let superadmins through companyable trait
2016-06-10 04:07:27 -07:00
snipe
02a9394cd9
Merge remote-tracking branch 'origin/v3' into v3-master
2016-06-10 03:41:03 -07:00
snipe
ec4bc6c2af
Allow superadmins to print labels
2016-06-10 03:40:49 -07:00
snipe
f44d98924d
Removed erroneous call to nonexistent model
2016-06-09 14:42:13 -07:00
snipe
51742d66df
Removed uneeded size array
2016-06-08 23:28:21 -07:00
Daniel Meltzer
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
Daniel Meltzer
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
Daniel Meltzer
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
Daniel Meltzer
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
Daniel Meltzer
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
snipe
780c0e678d
Changed min dimensions to 500 from 300
2016-05-24 13:21:18 -07:00
snipe
f844bf4b41
Nicer focus handling for asset search
2016-05-24 01:10:05 -07:00
snipe
fb35e40342
Search by asset tag
...
Compatible with barcode scanners
2016-05-20 17:02:28 -07:00
snipe
cbcc155f27
Settings tweaks
2016-05-19 19:49:25 -07:00
snipe
29e54830e1
Added 2D barcodes to labels
2016-05-19 19:12:42 -07:00
snipe
6d91774943
[Feature Request] Fixes #2030 - allow asset name change on checkin
2016-05-12 12:34:44 -07:00
snipe
ae8a03fec3
Add manufacturer name/sorting/searching on assets
2016-05-12 10:38:57 -07:00
snipe
ba01b20ad4
Use updated redirect() reference
2016-04-28 21:06:41 -07:00
snipe
3eb09871cf
Fixed model name
2016-04-23 03:12:39 -07:00
snipe
93e7715c28
Fixes dumb timestamp if the user manually removes date
2016-04-23 02:34:29 -07:00
snipe
7e0ab645bf
Removed junk text
2016-04-23 02:09:52 -07:00
snipe
4d4b4ffd36
Use new checkout/checkin method
2016-04-23 02:08:38 -07:00
snipe
466f660a63
Removed older commented out code
2016-04-23 02:08:18 -07:00
