diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
index ae56298d90..ea3ff1ca97 100644
--- a/protected/humhub/docs/CHANGELOG.md
+++ b/protected/humhub/docs/CHANGELOG.md
@@ -10,6 +10,9 @@ HumHub Change Log
- Enh: Add possibility to delete an invitation [#2980](https://github.com/humhub/humhub/issues/2980)
- Enh: Moved search index tasks (add, update & delete) into asynchronous tasks
- Enh: Added search index rebuild button
+- Fix #3200 wall stream scroll not working after single entry load request
+- Fix added missing required validation of target space for move content feature
+- Enh: Added `humhub.modules.stream.StreamState.firstRequest` in order to determine the initial request
1.3.0-beta.1 (July 4, 2018)
diff --git a/protected/humhub/modules/content/models/forms/MoveContentForm.php b/protected/humhub/modules/content/models/forms/MoveContentForm.php
index 66560f02e0..72c92d4c98 100644
--- a/protected/humhub/modules/content/models/forms/MoveContentForm.php
+++ b/protected/humhub/modules/content/models/forms/MoveContentForm.php
@@ -47,7 +47,8 @@ class MoveContentForm extends Model
public function rules()
{
return [
- [['target'], 'validateTarget']
+ [['target'], 'validateTarget'],
+ [['target'], 'required']
];
}
diff --git a/protected/humhub/modules/content/views/move/moveModal.php b/protected/humhub/modules/content/views/move/moveModal.php
index f5f4d5505c..457fa9b786 100644
--- a/protected/humhub/modules/content/views/move/moveModal.php
+++ b/protected/humhub/modules/content/views/move/moveModal.php
@@ -13,7 +13,7 @@ $canMove = $model->isMovable() === true;
?>
Yii::t('ContentModule.base', 'Move content')]) ?>
-
+ false]) ?>
= $form->field($model, 'target')->widget(SpacePickerField::class, [
@@ -28,7 +28,7 @@ $canMove = $model->isMovable() === true;
diff --git a/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js b/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js
index 1d74b57669..6870bac00d 100644
--- a/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js
+++ b/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js
@@ -134,9 +134,11 @@ humhub.module('stream.Stream', function (module, require, $) {
var contentId = this.$.data(DATA_STREAM_CONTENTID);
this.$.data(DATA_STREAM_CONTENTID, null);
- return new StreamRequest(this, {
+ this.state.firstRequest = new StreamRequest(this, {
contentId: contentId,
- limit: this.options.initLoadCount}).load();
+ limit: this.options.initLoadCount});
+
+ return this.state.firstRequest.load();
};
Stream.prototype.handleResponse = function(request) {
diff --git a/protected/humhub/modules/stream/resources/js/humhub.stream.wall.js b/protected/humhub/modules/stream/resources/js/humhub.stream.wall.js
index 4e8dc79ca3..f1ee15aa46 100644
--- a/protected/humhub/modules/stream/resources/js/humhub.stream.wall.js
+++ b/protected/humhub/modules/stream/resources/js/humhub.stream.wall.js
@@ -112,7 +112,7 @@ humhub.module('stream.wall', function (module, require, $) {
WallStream.prototype.initScroll = function() {
var that = this;
$(window).off('scroll.wallStream').on('scroll.wallStream', function () {
- if(that.state.scrollLock || !that.canLoadMore() || !that.state.lastRequest || that.state.lastRequest.isSingleEntryRequest()) {
+ if(that.state.scrollLock || !that.canLoadMore() || !that.state.lastRequest || that.state.firstRequest.isSingleEntryRequest()) {
return;
}