Daniel Meltzer
a852c624d3
Fix 2347 ( #2394 )
...
* Prevent multiple checkouts of the same asset.
This adds a new method to the Asset model, availableForCheckout.
Port getDataTable to use availableForCheckout instead of doing the
check manually.
Fixes Issue #2347
* Use availableForCheckout in categories controller. Also gate the checkin/checkout actions here.
* Use gate and availableForCheckout in manufactuers as well.
2016-08-16 13:02:42 -07:00
snipe
7edf1db101
Small tweaks to history
2016-08-12 19:03:32 -07:00
snipe
41a20d8f66
Tidied up some debugging code, better explanation
2016-08-12 17:10:03 -07:00
snipe
ba5a2edd54
CSV history routes
2016-08-12 16:02:09 -07:00
snipe
c73cbccffc
Method to import CSV history
2016-08-12 16:01:59 -07:00
snipe
18e576e5fd
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-08-11 22:03:25 -07:00
snipe
4c787891e4
Use custom maintenance middleware
2016-08-11 19:22:26 -07:00
Daniel Meltzer
dbd96a4c10
Don't try to format a formatted number string. ( #2396 )
...
The importer already formatted/parsed numbers on input into the db
(maybe it shouldn't have?) so running number_format on that string
throws an exception. Check to make sure the value is numeric before
formatting it.
2016-08-11 19:13:49 -07:00
snipe
3a81b7e612
Eager load asset query on maintenances to prevent n+1 queries
2016-08-11 15:56:21 -07:00
snipe
1d3255a00b
Allow admin to turn LDAP password sync off.
...
This is added to handle customers/users with a security policy that prohibits third-parties or external databases from storing LDAP passwords.
2016-08-04 14:29:28 -07:00
snipe
fff2bce9e4
Added missing username in header row
2016-08-02 15:16:01 -07:00
snipe
75e0c5565c
Add username and custom fields option to custom report
2016-08-02 15:04:10 -07:00
snipe
ca8ca89955
Added custom color to status labels, only show status labels if there are results
2016-08-02 13:25:50 -07:00
snipe
1612562f41
Create log record and send EULA when creating a new asset that’s checked out
2016-08-02 10:33:44 -07:00
snipe
17d5e40e02
Fixes #2383
2016-08-02 09:54:31 -07:00
snipe
39929c7d89
Better handling for deleted users
2016-08-02 04:23:13 -07:00
snipe
66ad0f1d4c
Better fix for location LDAP sync
2016-08-02 03:50:08 -07:00
snipe
3b247ba31f
Ignore location field if no value is passed
2016-08-02 03:45:03 -07:00
snipe
39450c1fe9
Eager load throttle query
2016-08-02 01:23:53 -07:00
snipe
886a31190c
Fixed route
2016-08-02 01:08:37 -07:00
snipe
8246a319a2
Fixes #2363 and #1097
2016-08-02 00:54:38 -07:00
snipe
27adeb427e
Generate barcodes locally and try to serve them if they exist
2016-08-01 22:56:28 -07:00
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
c07ad03e74
Removed unique from form request
2016-07-28 09:16:30 -07:00
snipe
68b7b8f932
Fixes Carbon date
2016-07-28 08:51:01 -07:00
snipe
f31637adb4
Fixes #2346
2016-07-28 08:39:28 -07:00
snipe
3e5d2b5385
Ability to remove field from fieldset
2016-07-28 08:10:15 -07:00
snipe
fbd0059bbb
Fixes #2317
2016-07-28 08:07:14 -07:00
snipe
f53c5706f6
Fixes #2341
2016-07-28 07:36:58 -07:00
snipe
14b0a6315f
Pass users path to get_src
2016-07-28 05:49:41 -07:00
snipe
eb508901c5
Zerofilling for auto-increment
2016-07-27 21:28:00 -07:00
Daniel Meltzer
a401986ef5
Only set the category_type in postEdit if the category is empty. ( #2337 )
...
Fixes #2333
2016-07-27 16:13:54 -07:00
snipe
2e665e128f
Putting uniqueUndeleted into a trait for use across models
2016-07-26 01:39:30 -07:00
snipe
ad531d6d59
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-07-25 22:10:38 -07:00
snipe
261d2f133b
Only bcrypt temp passwords once for performance
2016-07-25 22:10:33 -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
eec22c5aeb
Removed port stuff, since LDAP ignores it anyway :-/
2016-07-22 16:21:16 -07:00
snipe
b03330aae0
Added TLS option in settings for LDAP
2016-07-22 16:00:37 -07:00
snipe
ba25972b49
Add LDAP port number option
2016-07-22 15:09:49 -07:00
snipe
d4138f4364
Fixes #2299
2016-07-22 03:10:25 -07:00
snipe
b2d958724b
Removed commented code
2016-07-22 02:11:37 -07:00
snipe
9385c3e9cf
Remove last name requirement from Form Request
2016-07-21 19:46:46 -07:00
snipe
92175eb700
Few more LDAP/AD tweaks
2016-07-14 23:49:32 -07:00
snipe
0cf8ac1d95
Add AD domain to settings
2016-07-14 15:52:52 -07:00
snipe
8fd8e747d9
Fix for missing input variable in suppliers ajax method
2016-07-13 22:35:21 -07:00
snipe
e6b872299d
Possible fix for #2246 - needs AD testing
2016-07-13 15:18:29 -07:00
snipe
40b56cfad7
Removed unused variables
2016-07-13 07:24:54 -07:00
snipe
5cd2c78d5e
Link to location view, not edit
2016-07-13 07:16:10 -07:00
snipe
ab6e2a7301
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-07-13 05:50:45 -07:00
