diff --git a/protected/humhub/docs/CHANGELOG_DEV.md b/protected/humhub/docs/CHANGELOG_DEV.md index 102d65c1c0..04425fdd4c 100644 --- a/protected/humhub/docs/CHANGELOG_DEV.md +++ b/protected/humhub/docs/CHANGELOG_DEV.md @@ -13,6 +13,7 @@ HumHub Change Log (DEVELOP) - Enh: **Theme:** use of colored required input field asterisk - Fix #3784: `ActiveQueryContent::readable()` not working for global content - Chng: Removed italic text from summary mail of comment and content activities for better readability +- Fix #3805: Cannot select more than one activity in E-Mail Summaries settings 1.4.0-beta.2 diff --git a/protected/humhub/modules/activity/views/mailSummaryForm.php b/protected/humhub/modules/activity/views/mailSummaryForm.php index 9df9903832..48c397420f 100644 --- a/protected/humhub/modules/activity/views/mailSummaryForm.php +++ b/protected/humhub/modules/activity/views/mailSummaryForm.php @@ -14,19 +14,20 @@ use yii\bootstrap\ActiveForm; use humhub\modules\space\widgets\SpacePickerField; ?> - -field($model, 'interval')->dropDownList($model->getIntervals()); ?> -field($model, 'limitSpacesMode')->radioList($model->getLimitSpaceModes()); ?> -field($model, 'limitSpaces')->widget(SpacePickerField::class, [])->label(false); ?> -field($model, 'activities')->checkboxList($model->getActivitiesArray(), [ - 'labelOptions' => [ - 'encode' => false - ], 'encode' => true]); ?> + false]); ?> -
- -userSettingsLoaded): ?> - 'btn btn-default pull-right', 'data-ui-loader' => '', 'data-method' => 'POST']); ?> - + field($model, 'interval')->dropDownList($model->getIntervals()); ?> + field($model, 'limitSpacesMode')->radioList($model->getLimitSpaceModes()); ?> + field($model, 'limitSpaces')->widget(SpacePickerField::class, [])->label(false); ?> + field($model, 'activities')->checkboxList($model->getActivitiesArray(), [ + 'labelOptions' => [ + 'encode' => false + ], 'encode' => true]); ?> - \ No newline at end of file +
+ + userSettingsLoaded): ?> + 'btn btn-default pull-right', 'data-ui-loader' => '', 'data-method' => 'POST']); ?> + + + diff --git a/protected/humhub/modules/activity/views/user/defaults.php b/protected/humhub/modules/activity/views/user/defaults.php index 528af3b637..a77ee3c867 100644 --- a/protected/humhub/modules/activity/views/user/defaults.php +++ b/protected/humhub/modules/activity/views/user/defaults.php @@ -6,8 +6,11 @@ * @license https://www.humhub.com/licences */ -/* @var $model \humhub\modules\notification\models\forms\NotificationSettings */ -?> +use humhub\modules\activity\models\MailSummaryForm; + +/* @var $model MailSummaryForm */ + + ?>
E-Mail Summaries'); ?> @@ -17,7 +20,7 @@

- + render('@activity/views/mailSummaryForm', ['model' => $model]); ?>