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

Enh #5280: Allow to set the number of contents from which "Show {i} more." appears in the stream (#5288)

Browse Source
This commit is contained in:
Marc Farré 2021-09-15 18:20:00 +02:00 committed by GitHub
parent c5d009a06b
commit 569651f104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_DEV.md
View File

@ -20,3 +20,4 @@
- Enh #5005: Possibility to invite a registered user to a space by email - Enh #5005: Possibility to invite a registered user to a space by email
- Enh #3546: Sign in back from impersonate mode - Enh #3546: Sign in back from impersonate mode
- Fix #5282: On account creation, registration form has HTML tag set with English language - Fix #5282: On account creation, registration form has HTML tag set with English language
- Enh #5280: Allow to set the number of contents from which "Show {i} more." appears in the stream

5
protected/humhub/modules/stream/Module.php
View File

@ -32,6 +32,11 @@ class Module extends \humhub\components\Module
*/ */
public $defaultStreamSuppressQueryIgnore = [\humhub\modules\post\models\Post::class, \humhub\modules\activity\models\Activity::class]; public $defaultStreamSuppressQueryIgnore = [\humhub\modules\post\models\Post::class, \humhub\modules\activity\models\Activity::class];
/**
* @var int number of contents from which "Show more" appears in the stream
*/
public $streamSuppressLimit = 2;
/** /**
* @var boolean show contents of deactivated users in stream * @var boolean show contents of deactivated users in stream
*/ */

5
protected/humhub/modules/stream/models/StreamSuppressQuery.php
View File

@ -85,7 +85,10 @@ class StreamSuppressQuery extends StreamQuery
*/ */
protected function isSuppressionActive() protected function isSuppressionActive()
{ {
return !($this->preventSuppression || $this->limit < 3 || $this->isSingleContentQuery()); /* @var $streamModule \humhub\modules\stream\Module */
$streamModule = Yii::$app->getModule('stream');
return !($this->preventSuppression || $this->limit <= $streamModule->streamSuppressLimit || $this->isSingleContentQuery());
} }
/** /**