Commit graph

183 commits

Author SHA1 Message Date
snipe
51742d66df Removed uneeded size array 2016-06-08 23:28:21 -07:00
snipe
75eb2bbe09 Janky-ass form request stuff 2016-06-06 21:02:06 -07:00
snipe
d4e231d5d4 Save permissions on new user 2016-06-06 18:56:43 -07:00
snipe
75dfb87671 Use form request for user add/edit to handle password and password confirmation 2016-06-06 14:15:50 -07:00
snipe
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
snipe
13d11bfdcc Merge pull request #2121 from dmeltzer/add-soft-pave
Add a 'soft' delete option to the pave tool.
2016-06-06 12:30:06 -07:00
snipe
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
Daniel Meltzer
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
Daniel Meltzer
6ba37a3a8d Add a 'soft' delete option to the pave tool. This leaves db structure and migrations in place but removes everything inside the db except the first user. 2016-06-05 10:24:42 -05:00
Daniel Meltzer
a89511674b Add clone icon to Assetmodels index page. 2016-06-05 10:00:31 -05: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
snipe
9f6eb02afc Don't purge users where show_in_list = 1
This is necessary so hosted customers can't hard-delete my account :-/
2016-06-03 12:13:59 -07:00
snipe
f8ac9a3f77 Fixes #2110 2016-06-03 11:48:20 -07:00
snipe
c5d96812f3 Fixed erronerously removed save methods 2016-06-02 17:22:23 -07:00
snipe
95f94c1cfb Fixed error when user has no permissions values 2016-06-02 17:16:22 -07:00
snipe
2d5a0deb31 Eager loading for requestable assets account page 2016-06-02 02:57:22 -07:00
snipe
7d2ea36997 Use permission gates on routes 2016-06-02 02:50:00 -07:00
snipe
97691726f0 Updates to permissions decoding 2016-06-02 02:49:32 -07:00
snipe
049e13e365 Switch to gate for permission check 2016-06-02 02:48:52 -07:00
snipe
dddb0f7267 Fixed group error message 2016-06-02 02:46:49 -07:00
snipe
5de6b8e016 Added gates to authservice provider for finer tuned permissions 2016-06-02 02:40:49 -07:00
snipe
46d3a784a2 Fixes groups for cloning users 2016-06-02 00:41:10 -07:00
snipe
1daa6abf48 Merge pull request #2101 from dmeltzer/importer-again
Case insensitive string comparison for items when importing
2016-06-01 18:13:02 -07:00
snipe
04610e7864 Just use model validation for new user 2016-06-01 18:04:11 -07:00
Daniel Meltzer
da01591ab8 Case insensitive string comparison for items when comparing with existing items. Fixes some false errors. Also remove stray characters from manufacturer logging. 2016-06-01 19:31:24 -05:00
snipe
cffa76e627 Find first record, instead of hardcoded id 1 2016-06-01 15:50:50 -07:00
snipe
9c4cd9c3ce Save email/username format in settings controller 2016-06-01 15:45:26 -07:00
snipe
eacf70ee3f Updated validation 2016-06-01 15:45:05 -07:00
snipe
f3c6275f8d Removed settings form request 2016-06-01 15:43:12 -07:00
Daniel Meltzer
1c1ef951e9 Fix a regression in Helper::usersList and ::managerList() where the "Select a User" option disappeared. Also format names the way they used to be formatted. 2016-06-01 13:47:46 -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
snipe
11c400f12b Merge pull request #2095 from dmeltzer/importer-improvements
Reduce Import error warnings in importer.
2016-05-31 17:45:29 -07:00
Daniel Meltzer
f2a5337ad2 Simplify 2016-05-31 19:41:14 -05:00
Daniel Meltzer
4af5cdd64f asset_id is not allowed to be null in asset_log according to db schema. 0 it out here to make sqlite happy. 2016-05-31 19:41:14 -05:00
Daniel Meltzer
0fa82743a1 Remove remaining DB::Raw(concat) calls to make things more sqlite friendly. This adds one new method to the Asset Model to return the formatted string that was used by the license and asset maintence controller. It also fixes a potential sqlite-only issue where '' and null are different. 2016-05-31 19:41:14 -05:00
Daniel Meltzer
45d93ffa8c Use a transaction while creating license seats. Makes adding a license with a large number of seats much more managable. 2016-05-31 19:41:14 -05:00
Daniel Meltzer
4b98711e07 Replace the assorted concat() methods with a full_name method in the User model and adjust queries accordingly 2016-05-31 19:41:14 -05:00
Daniel Meltzer
a729038ccd Fix typo. 2016-05-31 19:00:11 -05:00
Daniel Meltzer
dab2a50982 Only display errors in import table if things actually prevent the asset from being created. Also some table formatting improvements. 2016-05-31 18:04:01 -05:00
snipe
0e0b31bba6 Company name length to 1 2016-05-31 15:04:13 -07: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
Daniel Meltzer
891c37b2ed Add warranty months. Also fix a merge issue where things reverted back to comment instead of log. 2016-05-25 21:13:26 -05:00
Daniel Meltzer
e353df588f Importer improvements. If user real name doesn't exist don't try to create the user. 2016-05-25 20:47:46 -05:00
Daniel Meltzer
fd0d04eba4 Import status labels. 2016-05-25 20:46:01 -05:00
Daniel Meltzer
22c6f32e92 Instead of a field in the csv, set whether assets, consumables, or accessories are generated by an option on the command line. Also Adjustconsumables/accessories to function smoother. 2016-05-25 20:37:19 -05:00
Daniel Meltzer
04428d2d07 Replace console output in ObjectImporter with a logging mechanism. Also track all model/validation errors and output them at the end of the import, rather than inline. 2016-05-25 20:37:19 -05:00
snipe
37be587c39 Make regular and highlight colors the same, since we're not using highlight colors in the pie chart yet 2016-05-24 16:19:44 -07:00
snipe
0c33575962 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-24 16:10:45 -07:00