mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-16 21:58:17 +01:00
Code Issues Projects Releases Wiki Activity

REST Endpoint for pending invites - Extended response (#7138)

Browse Source 
* REST Endpoint for pending invites - Extended response

* REST Endpoint for pending invites - Extended response

* REST Endpoint for pending invites - Extended response

* Update CHANGELOG.md

---------

Co-authored-by: Lucas Bartholemy <luke-@users.noreply.github.com>
This commit is contained in:
Gevorg Mansuryan 2024-07-25 19:12:26 +04:00 committed by GitHub
parent 15a23d6ce6
commit fef09e31bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ HumHub Changelog
- Enh #7128: Prerequisites - check for mixed table collations - Enh #7128: Prerequisites - check for mixed table collations
- Enh #7129: Link `wall-entry-controls`- color to `--text-color-soft` - Enh #7129: Link `wall-entry-controls`- color to `--text-color-soft`
- Chg #7136: When opening a modal box, don't autofocus automatically on the first form input - Chg #7136: When opening a modal box, don't autofocus automatically on the first form input
- Enh #7138: Added missing DB relations to UserInvite model
1.16.2 (Unreleased) 1.16.2 (Unreleased)
--------------------- ---------------------

16
protected/humhub/modules/user/models/Invite.php
View File

@ -35,8 +35,10 @@ use yii\helpers\Url;
* @property string $lastname * @property string $lastname
* @property string $captcha * @property string $captcha
* *
* @property Space $space * @property-read Space $space
* @property User|null $originator * @property-read User|null $originator
* @property-read User|null $createdBy
* @property-read User|null $updatedBy
*/ */
class Invite extends ActiveRecord class Invite extends ActiveRecord
{ {
@ -313,4 +315,14 @@ class Invite extends ActiveRecord
!$this->skipCaptchaValidation !$this->skipCaptchaValidation
&& (Yii::$app->getModule('user')->settings->get('auth.showCaptureInRegisterForm')); && (Yii::$app->getModule('user')->settings->get('auth.showCaptureInRegisterForm'));
} }
public function getCreatedBy()
{
return $this->hasOne(User::class, ['id' => 'created_by']);
}
public function getUpdatedBy()
{
return $this->hasOne(User::class, ['id' => 'updated_by']);
}
} }