@@ -9,8 +9,8 @@ |
||
9 | 9 | namespace flipbox\organization\controllers; |
10 | 10 | |
11 | 11 | use Craft; |
12 | -use flipbox\organization\elements\Organization as OrganizationElement; |
|
13 | 12 | use flipbox\organization\Organization as OrganizationPlugin; |
13 | +use flipbox\organization\elements\Organization as OrganizationElement; |
|
14 | 14 | use yii\web\ForbiddenHttpException; |
15 | 15 | |
16 | 16 | /** |
@@ -11,11 +11,11 @@ |
||
11 | 11 | use Craft; |
12 | 12 | use craft\base\Field; |
13 | 13 | use craft\helpers\UrlHelper; |
14 | +use flipbox\organization\Organization as OrganizationPlugin; |
|
14 | 15 | use flipbox\organization\elements\Organization as OrganizationElement; |
15 | 16 | use flipbox\organization\elements\User as UserElement; |
16 | 17 | use flipbox\organization\events\RegisterOrganizationActions; |
17 | 18 | use flipbox\organization\models\Type; |
18 | -use flipbox\organization\Organization as OrganizationPlugin; |
|
19 | 19 | use flipbox\organization\web\assets\element\Element; |
20 | 20 | use flipbox\spark\helpers\SiteHelper; |
21 | 21 | use yii\web\Response; |
@@ -10,17 +10,17 @@ |
||
10 | 10 | |
11 | 11 | use Craft; |
12 | 12 | use craft\db\Query; |
13 | -use craft\elements\db\ElementQuery; |
|
14 | 13 | use craft\elements\User as UserElement; |
14 | +use craft\elements\db\ElementQuery; |
|
15 | 15 | use craft\helpers\ArrayHelper; |
16 | 16 | use craft\helpers\Db; |
17 | 17 | use craft\models\UserGroup; |
18 | 18 | use craft\records\UserGroup as UserGroupRecord; |
19 | 19 | use craft\records\UserGroup_User as UserGroupUsersRecord; |
20 | +use flipbox\organization\Organization as OrganizationPlugin; |
|
20 | 21 | use flipbox\organization\elements\Organization as OrganizationElement; |
21 | 22 | use flipbox\organization\helpers\Query as QueryHelper; |
22 | 23 | use flipbox\organization\models\Type; |
23 | -use flipbox\organization\Organization as OrganizationPlugin; |
|
24 | 24 | use flipbox\organization\records\Organization as OrganizationRecord; |
25 | 25 | use flipbox\organization\records\OrganizationType as OrganizationTypeOrganizationRecord; |
26 | 26 | use flipbox\organization\records\User as OrganizationUserRecord; |
@@ -9,24 +9,24 @@ |
||
9 | 9 | namespace flipbox\organization\elements; |
10 | 10 | |
11 | 11 | use Craft; |
12 | +use DateTime; |
|
12 | 13 | use craft\base\Element; |
13 | 14 | use craft\db\Query; |
15 | +use craft\elements\User; |
|
14 | 16 | use craft\elements\actions\Edit as EditAction; |
15 | 17 | use craft\elements\db\ElementQueryInterface; |
16 | 18 | use craft\elements\db\UserQuery; |
17 | -use craft\elements\User; |
|
18 | 19 | use craft\helpers\ArrayHelper; |
19 | 20 | use craft\helpers\StringHelper; |
20 | 21 | use craft\helpers\UrlHelper as UrlHelper; |
21 | 22 | use craft\validators\DateTimeValidator; |
22 | -use DateTime; |
|
23 | +use flipbox\organization\Organization as OrganizationPlugin; |
|
23 | 24 | use flipbox\organization\elements\actions\ChangeOrganizationStatus as StatusAction; |
24 | 25 | use flipbox\organization\elements\actions\DeleteOrganization as DeleteAction; |
25 | 26 | use flipbox\organization\elements\db\Organization as OrganizationQuery; |
26 | 27 | use flipbox\organization\helpers\Type as TypeHelper; |
27 | 28 | use flipbox\organization\helpers\User as UserHelper; |
28 | 29 | use flipbox\organization\models\Type as TypeModel; |
29 | -use flipbox\organization\Organization as OrganizationPlugin; |
|
30 | 30 | use flipbox\organization\records\Organization as OrganizationRecord; |
31 | 31 | use flipbox\organization\records\User as OrganizationUsersRecord; |
32 | 32 | use flipbox\organization\validators\Owner; |
@@ -13,8 +13,8 @@ |
||
13 | 13 | use craft\models\FieldLayout; |
14 | 14 | use craft\validators\SiteIdValidator; |
15 | 15 | use craft\validators\UriFormatValidator; |
16 | -use flipbox\organization\elements\Organization as OrganizationElement; |
|
17 | 16 | use flipbox\organization\Organization as OrganizationPlugin; |
17 | +use flipbox\organization\elements\Organization as OrganizationElement; |
|
18 | 18 | use flipbox\spark\models\ModelWithId; |
19 | 19 | use yii\base\InvalidConfigException; |
20 | 20 |
@@ -11,8 +11,8 @@ |
||
11 | 11 | use Craft; |
12 | 12 | use craft\helpers\App; |
13 | 13 | use craft\helpers\ArrayHelper; |
14 | -use flipbox\organization\elements\db\Organization; |
|
15 | 14 | use flipbox\organization\elements\Organization as OrganizationElement; |
15 | +use flipbox\organization\elements\db\Organization; |
|
16 | 16 | use flipbox\organization\models\Type as TypeModel; |
17 | 17 | use flipbox\organization\models\TypeSettings as TypeSettingsModel; |
18 | 18 | use flipbox\organization\records\TypeSettings as TypeSettingsRecord; |
@@ -11,10 +11,10 @@ |
||
11 | 11 | use Craft; |
12 | 12 | use craft\elements\User as UserElement; |
13 | 13 | use craft\helpers\ArrayHelper; |
14 | -use flipbox\organization\elements\db\Organization as OrganizationQuery; |
|
14 | +use flipbox\organization\Organization as OrganizationPlugin; |
|
15 | 15 | use flipbox\organization\elements\Organization as OrganizationElement; |
16 | +use flipbox\organization\elements\db\Organization as OrganizationQuery; |
|
16 | 17 | use flipbox\organization\fields\User as OrganizationUserField; |
17 | -use flipbox\organization\Organization as OrganizationPlugin; |
|
18 | 18 | use flipbox\organization\records\User; |
19 | 19 | use flipbox\spark\helpers\RecordHelper; |
20 | 20 | use yii\base\Component; |
@@ -10,17 +10,17 @@ |
||
10 | 10 | |
11 | 11 | use Craft; |
12 | 12 | use craft\db\Query; |
13 | +use craft\elements\User as UserElement; |
|
13 | 14 | use craft\elements\db\ElementQueryInterface; |
14 | 15 | use craft\elements\db\UserQuery; |
15 | -use craft\elements\User as UserElement; |
|
16 | 16 | use craft\helpers\DateTimeHelper; |
17 | 17 | use craft\models\FieldLayout as FieldLayoutModel; |
18 | 18 | use craft\records\Element as ElementRecord; |
19 | -use flipbox\organization\elements\db\Organization as OrganizationQuery; |
|
19 | +use flipbox\organization\Organization as OrganizationPlugin; |
|
20 | 20 | use flipbox\organization\elements\Organization as OrganizationElement; |
21 | +use flipbox\organization\elements\db\Organization as OrganizationQuery; |
|
21 | 22 | use flipbox\organization\events\ChangeOwner as ChangeOwnerEvent; |
22 | 23 | use flipbox\organization\events\ChangeStatus as ChangeStatusEvent; |
23 | -use flipbox\organization\Organization as OrganizationPlugin; |
|
24 | 24 | use flipbox\organization\records\Organization as OrganizationRecord; |
25 | 25 | use flipbox\spark\helpers\ArrayHelper; |
26 | 26 | use flipbox\spark\helpers\RecordHelper; |
@@ -12,11 +12,11 @@ |
||
12 | 12 | use craft\db\Query; |
13 | 13 | use craft\elements\User as UserElement; |
14 | 14 | use craft\helpers\ArrayHelper; |
15 | -use flipbox\organization\elements\db\User as UserQuery; |
|
15 | +use flipbox\organization\Organization as OrganizationPlugin; |
|
16 | 16 | use flipbox\organization\elements\Organization as OrganizationElement; |
17 | +use flipbox\organization\elements\db\User as UserQuery; |
|
17 | 18 | use flipbox\organization\events\ManageOrganizationUser; |
18 | 19 | use flipbox\organization\helpers\Query as QueryHelper; |
19 | -use flipbox\organization\Organization as OrganizationPlugin; |
|
20 | 20 | use flipbox\organization\records\User as OrganizationUserRecord; |
21 | 21 | use flipbox\spark\helpers\RecordHelper; |
22 | 22 | use yii\base\Component; |