Fix #3805: Cannot select more than one activity in E-Mail Summaries settings

This commit is contained in:
buddh4 2020-01-03 12:55:59 +01:00
parent 17d84278d2
commit eb96ddb5e0
3 changed files with 22 additions and 17 deletions

View File

@ -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

View File

@ -14,19 +14,20 @@ use yii\bootstrap\ActiveForm;
use humhub\modules\space\widgets\SpacePickerField;
?>
<?php $form = ActiveForm::begin(); ?>
<?= $form->field($model, 'interval')->dropDownList($model->getIntervals()); ?>
<?= $form->field($model, 'limitSpacesMode')->radioList($model->getLimitSpaceModes()); ?>
<?= $form->field($model, 'limitSpaces')->widget(SpacePickerField::class, [])->label(false); ?>
<?= $form->field($model, 'activities')->checkboxList($model->getActivitiesArray(), [
'labelOptions' => [
'encode' => false
], 'encode' => true]); ?>
<?php $form = ActiveForm::begin(['enableClientValidation' => false]); ?>
<br>
<?= Html::saveButton(); ?>
<?php if ($model->userSettingsLoaded): ?>
<?= Html::a(Yii::t('NotificationModule.base', 'Reset to defaults'), ['reset'], ['class' => 'btn btn-default pull-right', 'data-ui-loader' => '', 'data-method' => 'POST']); ?>
<?php endif; ?>
<?= $form->field($model, 'interval')->dropDownList($model->getIntervals()); ?>
<?= $form->field($model, 'limitSpacesMode')->radioList($model->getLimitSpaceModes()); ?>
<?= $form->field($model, 'limitSpaces')->widget(SpacePickerField::class, [])->label(false); ?>
<?= $form->field($model, 'activities')->checkboxList($model->getActivitiesArray(), [
'labelOptions' => [
'encode' => false
], 'encode' => true]); ?>
<?php ActiveForm::end(); ?>
<br>
<?= Html::saveButton(); ?>
<?php if ($model->userSettingsLoaded): ?>
<?= Html::a(Yii::t('NotificationModule.base', 'Reset to defaults'), ['reset'], ['class' => 'btn btn-default pull-right', 'data-ui-loader' => '', 'data-method' => 'POST']); ?>
<?php endif; ?>
<?php ActiveForm::end(); ?>

View File

@ -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 */
?>
<div class="panel-heading">
<?= Yii::t('ActivityModule.base', '<strong>E-Mail</strong> Summaries'); ?>
@ -17,7 +20,7 @@
<?= Yii::t('ActivityModule.base', 'E-Mail summaries are sent to inform you about recent activities in the network.'); ?><br />
<?= Yii::t('ActivityModule.base', 'On this page you can configure the contents and the interval of these e-mail updates.'); ?><br />
</div>
<?= $this->render('@activity/views/mailSummaryForm', ['model' => $model]); ?>
</div>