Commit graph

16 commits

Author SHA1 Message Date
snipe
8246a319a2 Fixes #2363 and #1097 2016-08-02 00:54:38 -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
4ed8ff5576 Formatting fixes for coding standards 2016-06-22 12:27:41 -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
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
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
snipe
a726934cde Fixed bulk delete+checkin for users 2016-05-12 21:01:31 -07:00
snipe
ba01b20ad4 Use updated redirect() reference 2016-04-28 21:06:41 -07:00
snipe
cd0df27516 Comment edit 2016-04-12 19:24:02 -07:00
snipe
bf728da39d Updated to use 5.2 trans() instead of Lang::get for localization 2016-04-07 13:39:35 -07:00
snipe
a62859dc6d Updated docblocks 2016-04-07 13:21:09 -07:00
snipe
95e4845176 Fix userlist for accessory checkout 2016-04-07 05:03:14 -07:00
snipe
4a7b0c0d0f Updated docblocks 2016-03-28 22:51:49 -07:00
snipe
bddb7fca23 Additional doc blocks, added private_uploads path 2016-03-25 15:50:08 -07:00
snipe
27543d16f6 Additional escaping 2016-03-25 15:24:12 -07:00
snipe
fe00b0e401 Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00