@@ -227,8 +227,8 @@ |
||
| 227 | 227 | *******************************************/ |
| 228 | 228 | |
| 229 | 229 | /** |
| 230 | - * @param UserAssociation|Organization|int|array|null $object |
|
| 231 | - * @return int|null |
|
| 230 | + * @param UserAssociation $object |
|
| 231 | + * @return string |
|
| 232 | 232 | */ |
| 233 | 233 | protected function findKey($object = null) |
| 234 | 234 | { |
@@ -8,17 +8,15 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\organizations\relationships; |
| 10 | 10 | |
| 11 | -use craft\base\ElementInterface; |
|
| 12 | -use craft\elements\db\ElementQueryInterface; |
|
| 11 | +use Tightenco\Collect\Support\Collection; |
|
| 13 | 12 | use craft\elements\User; |
| 13 | +use craft\elements\db\ElementQueryInterface; |
|
| 14 | 14 | use craft\helpers\ArrayHelper; |
| 15 | -use flipbox\organizations\elements\Organization; |
|
| 16 | 15 | use flipbox\organizations\Organizations; |
| 16 | +use flipbox\organizations\elements\Organization; |
|
| 17 | 17 | use flipbox\organizations\queries\OrganizationQuery; |
| 18 | 18 | use flipbox\organizations\queries\UserAssociationQuery; |
| 19 | 19 | use flipbox\organizations\records\UserAssociation; |
| 20 | -use Tightenco\Collect\Support\Collection; |
|
| 21 | -use yii\db\ActiveRecord; |
|
| 22 | 20 | |
| 23 | 21 | /** |
| 24 | 22 | * Manages Organizations associated to Users |
@@ -8,16 +8,13 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\organizations\relationships; |
| 10 | 10 | |
| 11 | +use Tightenco\Collect\Support\Collection; |
|
| 11 | 12 | use craft\helpers\ArrayHelper; |
| 12 | -use craft\helpers\Json; |
|
| 13 | -use flipbox\craft\ember\helpers\QueryHelper; |
|
| 14 | -use flipbox\organizations\elements\Organization; |
|
| 15 | 13 | use flipbox\organizations\Organizations; |
| 14 | +use flipbox\organizations\elements\Organization; |
|
| 16 | 15 | use flipbox\organizations\queries\OrganizationTypeAssociationQuery; |
| 17 | 16 | use flipbox\organizations\records\OrganizationType; |
| 18 | 17 | use flipbox\organizations\records\OrganizationTypeAssociation; |
| 19 | -use flipbox\organizations\records\UserAssociation; |
|
| 20 | -use Tightenco\Collect\Support\Collection; |
|
| 21 | 18 | |
| 22 | 19 | /** |
| 23 | 20 | * Manages Organization Types associated to Organizations |
@@ -210,8 +210,8 @@ |
||
| 210 | 210 | *******************************************/ |
| 211 | 211 | |
| 212 | 212 | /** |
| 213 | - * @param OrganizationTypeAssociation|OrganizationType|int|array|null $object |
|
| 214 | - * @return int|null |
|
| 213 | + * @param OrganizationTypeAssociation $object |
|
| 214 | + * @return string |
|
| 215 | 215 | */ |
| 216 | 216 | protected function findKey($object = null) |
| 217 | 217 | { |
@@ -219,8 +219,8 @@ |
||
| 219 | 219 | *******************************************/ |
| 220 | 220 | |
| 221 | 221 | /** |
| 222 | - * @param UserAssociation|User|int|array|null $object |
|
| 223 | - * @return int|null |
|
| 222 | + * @param UserAssociation $object |
|
| 223 | + * @return string |
|
| 224 | 224 | */ |
| 225 | 225 | protected function findKey($object = null) |
| 226 | 226 | { |
@@ -8,16 +8,15 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\organizations\relationships; |
| 10 | 10 | |
| 11 | +use Tightenco\Collect\Support\Collection; |
|
| 12 | +use craft\elements\User; |
|
| 11 | 13 | use craft\elements\db\ElementQueryInterface; |
| 12 | 14 | use craft\elements\db\UserQuery; |
| 13 | -use craft\elements\User; |
|
| 14 | 15 | use craft\helpers\ArrayHelper; |
| 15 | -use flipbox\organizations\elements\Organization; |
|
| 16 | 16 | use flipbox\organizations\Organizations; |
| 17 | -use flipbox\organizations\queries\OrganizationQuery; |
|
| 17 | +use flipbox\organizations\elements\Organization; |
|
| 18 | 18 | use flipbox\organizations\queries\UserAssociationQuery; |
| 19 | 19 | use flipbox\organizations\records\UserAssociation; |
| 20 | -use Tightenco\Collect\Support\Collection; |
|
| 21 | 20 | |
| 22 | 21 | /** |
| 23 | 22 | * Manages Users associated to Organizations |
@@ -8,17 +8,12 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\organizations\relationships; |
| 10 | 10 | |
| 11 | +use Tightenco\Collect\Support\Collection; |
|
| 11 | 12 | use craft\helpers\ArrayHelper; |
| 12 | -use craft\helpers\Json; |
|
| 13 | -use flipbox\craft\ember\helpers\QueryHelper; |
|
| 14 | -use flipbox\organizations\Organizations; |
|
| 15 | 13 | use flipbox\organizations\queries\UserTypeAssociationQuery; |
| 16 | -use flipbox\organizations\records\OrganizationType; |
|
| 17 | -use flipbox\organizations\records\OrganizationTypeAssociation; |
|
| 18 | 14 | use flipbox\organizations\records\UserAssociation; |
| 19 | 15 | use flipbox\organizations\records\UserType; |
| 20 | 16 | use flipbox\organizations\records\UserTypeAssociation; |
| 21 | -use Tightenco\Collect\Support\Collection; |
|
| 22 | 17 | |
| 23 | 18 | /** |
| 24 | 19 | * Manages User Types associated to Organization/User associations |
@@ -281,8 +281,8 @@ |
||
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | /** |
| 284 | - * @param UserTypeAssociation|UserType|int|array|null $object |
|
| 285 | - * @return int|null |
|
| 284 | + * @param UserAssociation $object |
|
| 285 | + * @return string |
|
| 286 | 286 | */ |
| 287 | 287 | protected function findKey($object = null) |
| 288 | 288 | { |
@@ -8,8 +8,6 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\organizations\objects; |
| 10 | 10 | |
| 11 | -use Craft; |
|
| 12 | -use flipbox\craft\ember\helpers\ObjectHelper; |
|
| 13 | 11 | use flipbox\organizations\elements\Organization; |
| 14 | 12 | |
| 15 | 13 | /** |
@@ -14,10 +14,10 @@ |
||
| 14 | 14 | use flipbox\craft\ember\records\IdAttributeTrait; |
| 15 | 15 | use flipbox\craft\ember\records\SortableTrait; |
| 16 | 16 | use flipbox\craft\ember\records\UserAttributeTrait; |
| 17 | -use flipbox\organizations\relationships\RelationshipInterface; |
|
| 18 | -use flipbox\organizations\relationships\UserTypeRelationship; |
|
| 19 | 17 | use flipbox\organizations\Organizations; |
| 20 | 18 | use flipbox\organizations\queries\UserAssociationQuery; |
| 19 | +use flipbox\organizations\relationships\RelationshipInterface; |
|
| 20 | +use flipbox\organizations\relationships\UserTypeRelationship; |
|
| 21 | 21 | use yii\db\ActiveQueryInterface; |
| 22 | 22 | use yii\helpers\Json; |
| 23 | 23 | |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | - * @param string|int $identifier |
|
| 56 | + * @param string $identifier |
|
| 57 | 57 | * @return ORganization|null |
| 58 | 58 | */ |
| 59 | 59 | protected function findOrganization($identifier) |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | /** |
| 65 | - * @param string|int $identifier |
|
| 65 | + * @param string $identifier |
|
| 66 | 66 | * @return User|null |
| 67 | 67 | */ |
| 68 | 68 | protected function findUser($identifier) |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | /** |
| 65 | - * @param string|int $identifier |
|
| 65 | + * @param string $identifier |
|
| 66 | 66 | * @return User|null |
| 67 | 67 | */ |
| 68 | 68 | protected function findUser($identifier) |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | /** |
| 142 | - * @param $data |
|
| 142 | + * @param User $data |
|
| 143 | 143 | * @return mixed |
| 144 | 144 | */ |
| 145 | 145 | protected function handleSuccessResponse($data) |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
| 153 | - * @param $data |
|
| 153 | + * @param User $data |
|
| 154 | 154 | * @return mixed |
| 155 | 155 | */ |
| 156 | 156 | protected function handleFailResponse($data) |
@@ -12,9 +12,8 @@ |
||
| 12 | 12 | use flipbox\craft\ember\actions\CheckAccessTrait; |
| 13 | 13 | use flipbox\craft\ember\actions\PopulateTrait; |
| 14 | 14 | use flipbox\organizations\actions\organizations\PopulateOrganizationTrait; |
| 15 | -use flipbox\organizations\cp\controllers\OrganizationTabsTrait; |
|
| 16 | 15 | use flipbox\organizations\cp\controllers\OrganizationSitesTrait; |
| 17 | -use flipbox\organizations\elements\Organization; |
|
| 16 | +use flipbox\organizations\cp\controllers\OrganizationTabsTrait; |
|
| 18 | 17 | use flipbox\organizations\elements\Organization as OrganizationElement; |
| 19 | 18 | use yii\base\Action; |
| 20 | 19 | |