@@ -7,8 +7,8 @@ |
||
7 | 7 | use craft\events\ModelEvent; |
8 | 8 | use craft\helpers\ArrayHelper; |
9 | 9 | use flipbox\craft\ember\helpers\QueryHelper; |
10 | -use flipbox\organizations\elements\Organization; |
|
11 | 10 | use flipbox\organizations\Organizations as OrganizationPlugin; |
11 | +use flipbox\organizations\elements\Organization; |
|
12 | 12 | use flipbox\organizations\queries\OrganizationQuery; |
13 | 13 | use flipbox\organizations\queries\UserAssociationQuery; |
14 | 14 | use flipbox\organizations\records\UserAssociation; |
@@ -6,8 +6,8 @@ |
||
6 | 6 | use craft\helpers\ArrayHelper; |
7 | 7 | use craft\helpers\Json; |
8 | 8 | use flipbox\craft\ember\helpers\QueryHelper; |
9 | -use flipbox\organizations\elements\Organization; |
|
10 | 9 | use flipbox\organizations\Organizations as OrganizationPlugin; |
10 | +use flipbox\organizations\elements\Organization; |
|
11 | 11 | use flipbox\organizations\queries\UserTypeQuery; |
12 | 12 | use flipbox\organizations\records\UserAssociation; |
13 | 13 | use flipbox\organizations\records\UserType; |
@@ -10,10 +10,10 @@ |
||
10 | 10 | |
11 | 11 | use Craft; |
12 | 12 | use flipbox\craft\ember\actions\models\CreateModel; |
13 | +use flipbox\organizations\Organizations; |
|
13 | 14 | use flipbox\organizations\cp\actions\general\traits\SiteSettingAttributesTrait; |
14 | 15 | use flipbox\organizations\models\Settings; |
15 | 16 | use flipbox\organizations\models\SiteSettings; |
16 | -use flipbox\organizations\Organizations; |
|
17 | 17 | use yii\base\Model; |
18 | 18 | use yii\web\HttpException; |
19 | 19 |
@@ -12,7 +12,6 @@ |
||
12 | 12 | use craft\helpers\ArrayHelper; |
13 | 13 | use flipbox\craft\ember\helpers\QueryHelper; |
14 | 14 | use flipbox\organizations\queries\OrganizationTypeQuery; |
15 | -use flipbox\organizations\records\OrganizationType; |
|
16 | 15 | use flipbox\organizations\records\OrganizationType as TypeModel; |
17 | 16 | use flipbox\organizations\records\OrganizationTypeAssociation; |
18 | 17 |
@@ -10,11 +10,10 @@ |
||
10 | 10 | |
11 | 11 | use Craft; |
12 | 12 | use craft\db\Query; |
13 | -use craft\elements\db\UserQuery; |
|
14 | 13 | use craft\elements\User; |
14 | +use craft\elements\db\UserQuery; |
|
15 | 15 | use craft\helpers\ArrayHelper; |
16 | 16 | use flipbox\craft\ember\helpers\QueryHelper; |
17 | -use flipbox\organizations\records\UserAssociation; |
|
18 | 17 | use flipbox\organizations\records\UserAssociation as OrganizationUsersRecord; |
19 | 18 | |
20 | 19 | /** |