Commit graph

282 commits

Author SHA1 Message Date
Daniel Meltzer
399e70763b Scope requestable assets to company as well. Updates to #2206. (#2326) 2016-07-26 16:22:56 -07:00
Daniel Meltzer
9e4ac018ea Don't allow users without a company to change the company of items if full company support is enabled. (#2321) 2016-07-26 13:31:36 -07:00
Daniel Meltzer
0bf5c6978e Make sure the assigned user is actually shown in the dropdown list. Not sure why this wasn't throwing an error for me, but this makes it actually behave. (#2322) 2016-07-26 13:06:38 -07:00
snipe
b76dc25ac0 Duh, we don’t soft-delete companies 2016-07-26 02:11:41 -07:00
snipe
b30369f7ce Added table name for trait 2016-07-26 02:04:31 -07:00
snipe
16fe53928c Updated undeleted validation 2016-07-26 01:49:21 -07:00
snipe
2e665e128f Putting uniqueUndeleted into a trait for use across models 2016-07-26 01:39:30 -07:00
snipe
a44b90dfc9 Custom validator for multiple deleted items with the same unique field 2016-07-26 00:44:26 -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
61108102d7 No longer require last name
I may regret this…
2016-07-21 19:44:07 -07:00
Daniel Meltzer
68b0bbbec9 Fix tests (#2273)
* Update installer script for v3 now that things have moved around.

* Make Statuslabel attributes fillable and add them to the generated array.  Fixes status label tests.
2016-07-19 15:50:21 -07:00
snipe
192b1582f5 Merge branch 'v3' of git@github.com:snipe/snipe-it.git 2016-07-15 16:46:15 -07:00
snipe
27b8d326e3 fix for undefined user 2016-07-15 16:38:49 -07:00
snipe
698cb161d4 Not sure how this ever worked? 2016-07-15 11:11:48 -07:00
snipe
92175eb700 Few more LDAP/AD tweaks 2016-07-14 23:49:32 -07:00
snipe
c1d2be651a Removed default pemissions 2016-07-14 18:32:54 -07:00
snipe
8729871353 Fucking rookie mistake. Send redbull. 2016-07-14 16:52:20 -07:00
snipe
99a42dfc38 More AD fixes 2016-07-14 16:27:32 -07:00
snipe
0cf8ac1d95 Add AD domain to settings 2016-07-14 15:52:52 -07:00
snipe
e6b872299d Possible fix for #2246 - needs AD testing 2016-07-13 15:18:29 -07:00
snipe
2ce1d8b985 Fixed missing use statement 2016-07-13 07:13:49 -07:00
snipe
b5d3843b7c New LDAP model 2016-07-13 05:48:16 -07:00
snipe
026f099ba3 Fixed indenting 2016-07-13 05:47:32 -07:00
snipe
7a4cbce460 Use trans instead of lang:: 2016-07-10 21:07:59 -07:00
snipe
3f835ba847 Updated lang to trans 2016-07-10 21:04:49 -07:00
snipe
3bb5479efd Move print statement to LOG 2016-07-01 16:24:58 -07:00
snipe
6d5bc64b2b Another fix for status label types
This is a little janky, as it breaks up the errors into multiple screens if you don't have a status label type AND don't have a name. This is because the model-level validation won't work since we transmogrify that dropdown list of status label types into  boolean values for the DB. Should eventually find a less clunky way to handle this, but needed to get a fix in now.
2016-06-28 14:52:11 -07:00
snipe
6633366b29 Small fix for status label types 2016-06-28 12:40:20 -07:00
snipe
483bf1b309 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-28 12:19:19 -07:00
snipe
0e96a0aa3e Updated comment 2016-06-28 12:19:14 -07:00
snipe
e4275bd3d3 Fixes status label inline creation 2016-06-28 12:19:05 -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
Daniel Meltzer
5bc52a9425 Link to user on asset checkout as well as checkin. 2016-06-23 09:39:50 -04:00
snipe
0cf563ae5b Show admin in maintenances 2016-06-22 17:04:47 -07:00
snipe
0ca85f8a8a Updates to components 2016-06-22 14:55:17 -07:00
snipe
f753783ca0 Smaller miminums for model and category name 2016-06-22 12:50:21 -07:00
snipe
4ed8ff5576 Formatting fixes for coding standards 2016-06-22 12:27:41 -07:00
Daniel Meltzer
5a45ec708b Use the model validation trait to validate asset maintences. Might be better to add a form request as well, but this at least makes the model validation occur. fixes #2170 2016-06-16 22:22:07 -04:00
snipe
6a277a5391 Added inheritance back into users/groups 2016-06-15 20:45:45 -07:00
snipe
c29984d0df Skip superuser check if the user isn't logged in 2016-06-13 19:05:29 -07:00
snipe
bfe4bc6ee5 Bypass company scoping if user is an admin 2016-06-13 11:40:22 -07:00
snipe
396446a34b Updated namespace for collection 2016-06-13 10:54:28 -07:00
snipe
2daed3c271 Fix for custom fields not saving 2016-06-10 16:36:46 -07:00
snipe
c1a3592059 Fixes #2130 2016-06-10 08:29:43 -07:00
snipe
a0901247a3 Let superadmins through companyable trait 2016-06-10 04:07:27 -07:00
snipe
ec4bc6c2af Allow superadmins to print labels 2016-06-10 03:40:49 -07:00
snipe
95f94c1cfb Fixed error when user has no permissions values 2016-06-02 17:16:22 -07:00