@@ -10,8 +10,8 @@ |
||
| 10 | 10 | |
| 11 | 11 | use craft\base\ElementInterface; |
| 12 | 12 | use flipbox\ember\actions\element\ElementCreate; |
| 13 | -use flipbox\organizations\elements\Organization as OrganizationElement; |
|
| 14 | 13 | use flipbox\organizations\Organizations; |
| 14 | +use flipbox\organizations\elements\Organization as OrganizationElement; |
|
| 15 | 15 | use yii\base\BaseObject; |
| 16 | 16 | |
| 17 | 17 | /** |
@@ -9,8 +9,8 @@ |
||
| 9 | 9 | namespace flipbox\organizations\actions\organizations; |
| 10 | 10 | |
| 11 | 11 | use flipbox\ember\actions\element\ElementUpdate; |
| 12 | -use flipbox\organizations\elements\Organization as OrganizationElement; |
|
| 13 | 12 | use flipbox\organizations\Organizations; |
| 13 | +use flipbox\organizations\elements\Organization as OrganizationElement; |
|
| 14 | 14 | use yii\base\BaseObject; |
| 15 | 15 | |
| 16 | 16 | /** |
@@ -13,9 +13,9 @@ |
||
| 13 | 13 | use craft\helpers\StringHelper; |
| 14 | 14 | use flipbox\ember\actions\model\ModelCreate; |
| 15 | 15 | use flipbox\ember\exceptions\ModelNotFoundException; |
| 16 | +use flipbox\organizations\Organizations; |
|
| 16 | 17 | use flipbox\organizations\models\Settings; |
| 17 | 18 | use flipbox\organizations\models\SiteSettings; |
| 18 | -use flipbox\organizations\Organizations; |
|
| 19 | 19 | use yii\base\BaseObject; |
| 20 | 20 | use yii\base\Model; |
| 21 | 21 | |
@@ -13,10 +13,10 @@ |
||
| 13 | 13 | use flipbox\ember\actions\element\traits\Lookup; |
| 14 | 14 | use flipbox\ember\actions\traits\CheckAccess; |
| 15 | 15 | use flipbox\ember\actions\traits\Populate; |
| 16 | +use flipbox\organizations\Organizations; |
|
| 16 | 17 | use flipbox\organizations\actions\organizations\traits\Populate as PopulateOrganization; |
| 17 | 18 | use flipbox\organizations\cp\controllers\traits\Sites; |
| 18 | 19 | use flipbox\organizations\elements\Organization as OrganizationElement; |
| 19 | -use flipbox\organizations\Organizations; |
|
| 20 | 20 | use yii\base\Action; |
| 21 | 21 | use yii\base\BaseObject; |
| 22 | 22 | |
@@ -123,7 +123,7 @@ |
||
| 123 | 123 | *******************************************/ |
| 124 | 124 | |
| 125 | 125 | /** |
| 126 | - * @param array $types |
|
| 126 | + * @param UserType[] $types |
|
| 127 | 127 | * @param int $userAssociationId |
| 128 | 128 | * @return array |
| 129 | 129 | */ |
@@ -13,10 +13,9 @@ |
||
| 13 | 13 | use flipbox\ember\helpers\ArrayHelper; |
| 14 | 14 | use flipbox\ember\helpers\ObjectHelper; |
| 15 | 15 | use flipbox\ember\services\traits\records\AccessorByString; |
| 16 | +use flipbox\organizations\Organizations as OrganizationsPlugin; |
|
| 16 | 17 | use flipbox\organizations\db\UserTypeQuery; |
| 17 | 18 | use flipbox\organizations\elements\Organization as OrganizationElement; |
| 18 | -use flipbox\organizations\Organizations as OrganizationPlugin; |
|
| 19 | -use flipbox\organizations\Organizations as OrganizationsPlugin; |
|
| 20 | 19 | use flipbox\organizations\records\UserAssociation; |
| 21 | 20 | use flipbox\organizations\records\UserType; |
| 22 | 21 | use flipbox\organizations\records\UserTypeAssociation; |
@@ -13,10 +13,9 @@ |
||
| 13 | 13 | use craft\models\FieldLayout; |
| 14 | 14 | use flipbox\ember\helpers\ObjectHelper; |
| 15 | 15 | use flipbox\ember\services\traits\records\AccessorByString; |
| 16 | +use flipbox\organizations\Organizations as OrganizationPlugin; |
|
| 16 | 17 | use flipbox\organizations\db\OrganizationTypeQuery; |
| 17 | 18 | use flipbox\organizations\elements\Organization as OrganizationElement; |
| 18 | -use flipbox\organizations\Organizations as OrganizationPlugin; |
|
| 19 | -use flipbox\organizations\records\OrganizationType; |
|
| 20 | 19 | use flipbox\organizations\records\OrganizationType as TypeRecord; |
| 21 | 20 | use flipbox\organizations\records\OrganizationTypeAssociation; |
| 22 | 21 | use yii\base\Component; |
@@ -11,8 +11,8 @@ |
||
| 11 | 11 | use Craft; |
| 12 | 12 | use craft\helpers\DateTimeHelper; |
| 13 | 13 | use craft\helpers\Json; |
| 14 | -use flipbox\organizations\elements\Organization as OrganizationElement; |
|
| 15 | 14 | use flipbox\organizations\Organizations as OrganizationPlugin; |
| 15 | +use flipbox\organizations\elements\Organization as OrganizationElement; |
|
| 16 | 16 | use flipbox\organizations\records\Organization as OrganizationRecord; |
| 17 | 17 | use yii\base\Component; |
| 18 | 18 | use yii\base\Exception; |