@@ -12,8 +12,8 @@ |
||
12 | 12 | use craft\helpers\ArrayHelper; |
13 | 13 | use craft\helpers\Json; |
14 | 14 | use flipbox\craft\ember\helpers\QueryHelper; |
15 | -use flipbox\organizations\elements\Organization; |
|
16 | 15 | use flipbox\organizations\Organizations; |
16 | +use flipbox\organizations\elements\Organization; |
|
17 | 17 | use flipbox\organizations\queries\UserAssociationQuery; |
18 | 18 | use flipbox\organizations\records\UserAssociation; |
19 | 19 |
@@ -162,7 +162,7 @@ |
||
162 | 162 | |
163 | 163 | /** |
164 | 164 | * @param OrganizationTypeAssociation|OrganizationType|int|array|null $type |
165 | - * @return OrganizationType|null |
|
165 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
166 | 166 | */ |
167 | 167 | protected function resolveType($type = null) |
168 | 168 | { |
@@ -11,8 +11,8 @@ |
||
11 | 11 | use craft\helpers\ArrayHelper; |
12 | 12 | use craft\helpers\Json; |
13 | 13 | use flipbox\craft\ember\helpers\QueryHelper; |
14 | -use flipbox\organizations\elements\Organization; |
|
15 | 14 | use flipbox\organizations\Organizations; |
15 | +use flipbox\organizations\elements\Organization; |
|
16 | 16 | use flipbox\organizations\queries\OrganizationTypeAssociationQuery; |
17 | 17 | use flipbox\organizations\records\OrganizationType; |
18 | 18 | use flipbox\organizations\records\OrganizationTypeAssociation; |
@@ -9,9 +9,9 @@ |
||
9 | 9 | namespace flipbox\organizations\managers; |
10 | 10 | |
11 | 11 | use Craft; |
12 | +use Tightenco\Collect\Support\Collection; |
|
12 | 13 | use craft\base\ElementInterface; |
13 | 14 | use craft\helpers\ArrayHelper; |
14 | -use Tightenco\Collect\Support\Collection; |
|
15 | 15 | use yii\base\Exception; |
16 | 16 | use yii\db\ActiveRecord; |
17 | 17 | use yii\db\QueryInterface; |
@@ -13,9 +13,9 @@ |
||
13 | 13 | use craft\helpers\ArrayHelper; |
14 | 14 | use craft\helpers\Json; |
15 | 15 | use flipbox\craft\ember\helpers\QueryHelper; |
16 | +use flipbox\organizations\Organizations; |
|
16 | 17 | use flipbox\organizations\behaviors\OrganizationsAssociatedToUserBehavior; |
17 | 18 | use flipbox\organizations\elements\Organization; |
18 | -use flipbox\organizations\Organizations; |
|
19 | 19 | use flipbox\organizations\queries\UserAssociationQuery; |
20 | 20 | use flipbox\organizations\records\UserAssociation; |
21 | 21 |