From f2f05b2531a3360ae5a99ed3a964f4b2d027fd4a Mon Sep 17 00:00:00 2001 From: Faeze Moradi Date: Tue, 6 Oct 2020 19:21:46 +0200 Subject: [PATCH] add summary to space --- .../migrations/m200930_151638_add_summary.php | 39 +++++++++++++++++++ .../humhub/modules/space/models/Space.php | 6 ++- .../modules/manage/views/default/index.php | 4 +- 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 protected/humhub/modules/space/migrations/m200930_151638_add_summary.php diff --git a/protected/humhub/modules/space/migrations/m200930_151638_add_summary.php b/protected/humhub/modules/space/migrations/m200930_151638_add_summary.php new file mode 100644 index 0000000000..12436ba236 --- /dev/null +++ b/protected/humhub/modules/space/migrations/m200930_151638_add_summary.php @@ -0,0 +1,39 @@ +addColumn('space', 'summary', 'text after description'); + } + + /** + * {@inheritdoc} + */ + public function safeDown() + { + echo "m200930_151638_add_summary cannot be reverted.\n"; + + return false; + } + + /* + // Use up()/down() to run migration code without a transaction. + public function up() + { + } + public function down() + { + echo "m200930_151638_add_summary cannot be reverted.\n"; + return false; + } + */ +} diff --git a/protected/humhub/modules/space/models/Space.php b/protected/humhub/modules/space/models/Space.php index fdc4dd67fc..39b924facd 100644 --- a/protected/humhub/modules/space/models/Space.php +++ b/protected/humhub/modules/space/models/Space.php @@ -45,6 +45,7 @@ use Yii; * @property string $guid * @property string $name * @property string $description + * @property string $summary * @property string $url * @property integer $join_policy * @property integer $visibility @@ -119,7 +120,7 @@ class Space extends ContentContainerActiveRecord implements Searchable $rules = [ [['join_policy', 'visibility', 'status', 'auto_add_new_members', 'default_content_visibility'], 'integer'], [['name'], 'required'], - [['description', 'tags', 'color'], 'string'], + [['description', 'summary', 'tags', 'color'], 'string'], [['join_policy'], 'in', 'range' => [0, 1, 2]], [['visibility'], 'in', 'range' => [0, 1, 2]], [['visibility'], 'checkVisibility'], @@ -145,7 +146,7 @@ class Space extends ContentContainerActiveRecord implements Searchable { $scenarios = parent::scenarios(); - $scenarios[static::SCENARIO_EDIT] = ['name', 'color', 'description', 'tags', 'join_policy', 'visibility', 'default_content_visibility', 'url']; + $scenarios[static::SCENARIO_EDIT] = ['name', 'color', 'description', 'summary', 'tags', 'join_policy', 'visibility', 'default_content_visibility', 'url']; $scenarios[static::SCENARIO_CREATE] = ['name', 'color', 'description', 'join_policy', 'visibility']; $scenarios[static::SCENARIO_SECURITY_SETTINGS] = ['default_content_visibility', 'join_policy', 'visibility']; @@ -162,6 +163,7 @@ class Space extends ContentContainerActiveRecord implements Searchable 'name' => Yii::t('SpaceModule.base', 'Name'), 'color' => Yii::t('SpaceModule.base', 'Color'), 'description' => Yii::t('SpaceModule.base', 'Description'), + 'summary' => Yii::t('SpaceModule.base', 'Summary'), 'join_policy' => Yii::t('SpaceModule.base', 'Join Policy'), 'visibility' => Yii::t('SpaceModule.base', 'Visibility'), 'status' => Yii::t('SpaceModule.base', 'Status'), diff --git a/protected/humhub/modules/space/modules/manage/views/default/index.php b/protected/humhub/modules/space/modules/manage/views/default/index.php index fdc387ce5e..86dc7d0f92 100644 --- a/protected/humhub/modules/space/modules/manage/views/default/index.php +++ b/protected/humhub/modules/space/modules/manage/views/default/index.php @@ -1,5 +1,6 @@ ['id' => 'spaceIndexForm'], 'enableClientValidation' => false]); ?> $form, 'model' => $model]) ?> - field($model, 'description')->textarea(['rows' => 6]); ?> + field($model, 'description')->textInput(); ?> + field($model, 'summary')->widget(RichTextField::class); ?> field($model, 'tags')->textInput(['maxlength' => 200]); ?> submit() ?>