Commit graph

3943 commits

Author SHA1 Message Date
Daniel Meltzer
dfea47a272 Fix location view display. Migrate to api controller methods and fix missing bits to make this happen. Show manager on the location view page. 2017-06-12 18:24:20 -05:00
Daniel Meltzer
f0d78091d2 Add a manager field to locations.
This is round one of the rethink of checkout-to-everything.  A location
now has a manager field, and the manager (by default) be responsible for
assets checked out to the location.
2017-06-12 18:23:50 -05:00
snipe
966a736602 Patches #3640 to develop 2017-06-12 15:31:11 -07:00
Daniel Nemanic
30a9704625 Update UsersController.php (#3640)
If a user is disabled in your Active Directory, it should be deactivated in the licensing too.

The standard state is now deactivated for synced accounts.
Maybe we can change this throw a Setting for a standard state.

The codes comes from this site:
http://www.netvision.com/ad_useraccountcontrol.php
2017-06-12 15:29:55 -07:00
snipe
14f3868b46 Update all controllers to use laravel 5 return view method 2017-06-09 16:44:03 -07:00
snipe
a5cd4a0a22 Use updated view method for laravel 5 2017-06-09 16:31:25 -07:00
snipe
ad816264e9 WIP import mapper #3639
@dmeltzer, I’m not sure how much extra work this will be to integrate.
2017-06-09 16:29:42 -07:00
snipe
041b794e1f Fixes #3634 - use new routes for groups 2017-06-08 20:24:26 -07:00
snipe
da2d9b2374 Fixes presenter issue on user history 2017-06-08 19:09:42 -07:00
snipe
58b2834c54 Fixed case for userloc 2017-06-08 18:46:07 -07:00
snipe
2aaa635345 Fixes crash on asset detail view 2017-06-08 18:26:55 -07:00
snipe
d62896f945 Fixes #3414 - bulk update for asset models 2017-06-08 17:48:48 -07:00
Wyatt
3e67cdc501 Allows a null location value for importing LDAP users (#3598)
* Allows a null location value for importing LDAP users

* Forgot you need to set the variable to null..
2017-06-01 21:20:40 -07:00
snipe
74aaadcdc5 Fixes #3583 - incorrect 404 status code, use curl for checking .env 2017-06-01 20:41:23 -07:00
snipe
25dca80644 Fixes #3602 - actions missing from suppliers in v4 2017-05-31 06:52:37 -07:00
snipe
7b1265cb89 Cache totals for later dashboard use 2017-05-31 02:02:55 -07:00
snipe
71b668e1a3 Removed extra else to make Codacy happy 2017-05-23 15:53:39 -07:00
snipe
8ab29c628f Added icon to presenter 2017-05-23 14:31:44 -07:00
snipe
4ada5eaa94 Added targetType method 2017-05-23 14:31:14 -07:00
snipe
5499735f3a Actionlogs API transformer 2017-05-23 14:31:04 -07:00
snipe
40e11b6661 Removed old getActivityReportDataTable() method, since we’re using the API now 2017-05-23 14:30:55 -07:00
snipe
b1fa25b73e Added filter to report by user_id for activity 2017-05-23 14:30:29 -07:00
snipe
452c52a3ab Changed variable name for consistency 2017-05-23 14:30:07 -07:00
snipe
52f24f7587 Reports API controller 2017-05-23 09:24:36 -07:00
snipe
f285bd3c29 Added Dept field to users table presenter 2017-05-23 02:49:51 -07:00
snipe
aeca549bab Dept search in User query scopes 2017-05-23 02:49:27 -07:00
snipe
e0d2cbef20 Allow manager to be null for dept 2017-05-23 02:49:00 -07:00
snipe
96e8109d01 Allow location/company/manager to be null via validation 2017-05-23 02:48:51 -07:00
snipe
b223630f72 Added dept to User API transformer 2017-05-23 02:48:03 -07:00
snipe
e9c39add4f Added dept helper reference in create/edit/bulk edit users 2017-05-23 02:47:49 -07:00
snipe
7ec1724308 Create, edit and destroy for depts 2017-05-23 02:47:25 -07:00
snipe
811ddd2f67 Include depts in returned list, sort by dept 2017-05-23 02:46:55 -07:00
snipe
cefb20d46f Set dept manager ID for dept 2017-05-23 02:46:25 -07:00
snipe
bb323db685 Load relationships in query 2017-05-23 02:46:03 -07:00
snipe
eb3aa99e4f Added destroy method to dept 2017-05-23 02:45:51 -07:00
snipe
a7592de304 Added helper for dept list 2017-05-23 02:37:37 -07:00
snipe
64f17cecbf Updated department transformer 2017-05-23 02:37:30 -07:00
snipe
e2f2f9e154 Additional methods for Department web UI 2017-05-23 01:09:13 -07:00
snipe
8caf6623f1 Filter by dept for user display 2017-05-23 01:09:03 -07:00
snipe
6c623866c0 Additional API methods for departments 2017-05-23 01:08:55 -07:00
snipe
659e60fd12 Department controllers and transformer 2017-05-22 21:32:33 -07:00
snipe
ae329f4160 Department model 2017-05-22 21:32:22 -07:00
snipe
71fd430f8e Fixes issue with older, deleted asset tags caching QR codes 2017-05-19 02:51:35 -07:00
snipe
0c43e64160 Licenses detail view 2017-05-18 22:10:45 -07:00
snipe
708385e23a Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-05-16 12:32:05 -07:00
Jason Spriggs
0ab37af7ab Add in location parent and child information into API requests (#3582)
* Add location hierarchy to LocationsTransformer

* Add in parent_id
2017-05-16 12:30:11 -07:00
snipe
891660d4ea Fixes #3580 - reduce minimim username size to 1 2017-05-16 12:26:38 -07:00
snipe
0c8308f5a4 Fixes for ordering on asset listing 2017-05-15 20:55:39 -07:00
snipe
fdd88af44a Fixes #3556 2017-05-15 19:14:55 -07:00
snipe
c8796cf045 Only prompt for checkin if there is an assigned user 2017-05-10 03:37:30 -07:00