@@ -120,7 +120,7 @@ |
||
| 120 | 120 | |
| 121 | 121 | /** |
| 122 | 122 | * Set Organization. |
| 123 | - * @param BaseOrganization $organization |
|
| 123 | + * @param Organization $organization |
|
| 124 | 124 | * @return boolean |
| 125 | 125 | */ |
| 126 | 126 | public function setOrganization($organization) |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | * @param string $name |
| 162 | 162 | * @param Organization $parent |
| 163 | 163 | * @param string $nickname |
| 164 | - * @param string $gravatar_type |
|
| 164 | + * @param integer $gravatar_type |
|
| 165 | 165 | * @param string $gravatar |
| 166 | 166 | * @param string $timezone |
| 167 | 167 | * @param string $description |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | * @param string $name |
| 178 | 178 | * @param Organization $parent |
| 179 | 179 | * @param string $nickname |
| 180 | - * @param string $gravatar_type |
|
| 180 | + * @param integer $gravatar_type |
|
| 181 | 181 | * @param string $gravatar |
| 182 | 182 | * @param string $timezone |
| 183 | 183 | * @param string $description |
@@ -17,7 +17,6 @@ |
||
| 17 | 17 | use yii\grid\GridView; |
| 18 | 18 | use yii\grid\DataColumn; |
| 19 | 19 | use yii\helpers\Html; |
| 20 | -use yii\helpers\Url; |
|
| 21 | 20 | use yii\web\View; |
| 22 | 21 | use yii\widgets\Pjax; |
| 23 | 22 | /* @var $this View */ |
@@ -10,13 +10,11 @@ |
||
| 10 | 10 | * @license https://vistart.me/license/ |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | -use rhosocial\organization\grid\OrganizationListActionColumn; |
|
| 14 | 13 | use rhosocial\organization\Organization; |
| 15 | 14 | use yii\data\ActiveDataProvider; |
| 16 | 15 | use yii\grid\DataColumn; |
| 17 | 16 | use yii\grid\GridView; |
| 18 | 17 | use yii\grid\SerialColumn; |
| 19 | -use yii\helpers\Html; |
|
| 20 | 18 | use yii\web\View; |
| 21 | 19 | |
| 22 | 20 | /* @var $dataProvider ActiveDataProvider */ |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * Check access. |
| 51 | - * @param Organization $org |
|
| 51 | + * @param \rhosocial\organization\Organization $org |
|
| 52 | 52 | * @param string|integer $id User ID. If access checking passed, it will be re-assigned with the User model. |
| 53 | 53 | * @param User $user |
| 54 | 54 | * @return boolean |
@@ -19,7 +19,6 @@ |
||
| 19 | 19 | use rhosocial\user\User; |
| 20 | 20 | use Yii; |
| 21 | 21 | use yii\base\Action; |
| 22 | -use yii\web\ServerErrorHttpException; |
|
| 23 | 22 | |
| 24 | 23 | /** |
| 25 | 24 | * |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | namespace rhosocial\organization\web\organization\controllers; |
| 14 | 14 | |
| 15 | 15 | use rhosocial\organization\exceptions\NumberOfOrganizationsExceededException; |
| 16 | -use rhosocial\user\UserProfileSearch; |
|
| 17 | 16 | use Yii; |
| 18 | 17 | use yii\filters\AccessControl; |
| 19 | 18 | use yii\filters\VerbFilter; |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | /** |
| 109 | 109 | * Assign SetUpOrganization permission. |
| 110 | 110 | * @param User|string|integer $user |
| 111 | - * @return boolean |
|
| 111 | + * @return integer |
|
| 112 | 112 | */ |
| 113 | 113 | public function actionAssignSetUpOrganization($user) |
| 114 | 114 | { |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | /** |
| 133 | 133 | * Revoke SetUpOrganization permission. |
| 134 | 134 | * @param User|string|integer $user |
| 135 | - * @return boolean |
|
| 135 | + * @return integer |
|
| 136 | 136 | */ |
| 137 | 137 | public function actionRevokeSetUpOrganization($user) |
| 138 | 138 | { |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | * Remove administrator |
| 245 | 245 | * @param Organization|string|integer $organization |
| 246 | 246 | * @param User|string|integer $user |
| 247 | - * @param boolean $keepMember |
|
| 247 | + * @param string|boolean $keepMember |
|
| 248 | 248 | * @throws Exception |
| 249 | 249 | * @return integer |
| 250 | 250 | */ |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | |
| 253 | 253 | /** |
| 254 | 254 | * Get subordinate limit query. |
| 255 | - * @return null|BaseBlameableQuery |
|
| 255 | + * @return null|\yii\db\ActiveQuery |
|
| 256 | 256 | */ |
| 257 | 257 | public function getSubordinateLimit() |
| 258 | 258 | { |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | |
| 265 | 265 | /** |
| 266 | 266 | * Get member limit query. |
| 267 | - * @return null|BaseBlameableQuery |
|
| 267 | + * @return null|\yii\db\ActiveQuery |
|
| 268 | 268 | */ |
| 269 | 269 | public function getMemberLimit() |
| 270 | 270 | { |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | |
| 574 | 574 | /** |
| 575 | 575 | * Add administrator. |
| 576 | - * @param User|integer|string $user User instance, or its GUID or ID. |
|
| 576 | + * @param User $user User instance, or its GUID or ID. |
|
| 577 | 577 | * @return boolean |
| 578 | 578 | * @throws \Exception |
| 579 | 579 | * @throws IntegrityException |