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

Merge branch 'master' of github.com:humhub/humhub into feature/collapsible-activites-widget

Browse Source
This commit is contained in:
Daniel Kesselberg 2018-08-14 22:21:34 +02:00
commit 76a659babc
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protected/humhub/modules/post/config.php
View File

@ -5,10 +5,10 @@ use humhub\modules\post\Events;
return [
'id' => 'post',
'class' => \humhub\modules\post\Module::className(),
'class' => \humhub\modules\post\Module::class,
'isCoreModule' => true,
'events' => [
[IntegrityController::className(), IntegrityController::EVENT_ON_RUN, [Events::className(), 'onIntegrityCheck']],
[IntegrityController::class, IntegrityController::EVENT_ON_RUN, [Events::class, 'onIntegrityCheck']],
]
];
?>

2
protected/humhub/modules/post/migrations/m150704_005338_namespace.php
View File

@ -8,7 +8,7 @@ class m150704_005338_namespace extends Migration
{
public function up()
{
$this->renameClass('Post', Post::className());
$this->renameClass('Post', Post::class);
}
public function down()

8
protected/humhub/modules/post/tests/codeception/fixtures/data/post.php
View File

@ -28,6 +28,10 @@ return [
['id' => '8', 'message_2trash' => null, 'message' => 'User 1 Space 1 Post Private ', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'],
['id' => '9', 'message_2trash' => null, 'message' => 'User 3 Space 1 Post Public ', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '3', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '3'],
['id' => '10', 'message_2trash' => null, 'message' => 'User 2 Space 2 Post Public', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'],
['id' => '11', 'message_2trash' => null, 'message' => 'User 2 Space 2 Post Private', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'],
['id' => '10', 'message_2trash' => null, 'message' => 'User 2 Space 2 Post Public', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '2', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '2'],
['id' => '11', 'message_2trash' => null, 'message' => 'User 2 Space 2 Post Private', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '2', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '2'],
['id' => '12', 'message_2trash' => null, 'message' => 'Admin Space 2 Post Public', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'],
['id' => '13', 'message_2trash' => null, 'message' => 'Admin Space 2 Post Private', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'],
];

1
protected/humhub/modules/post/views/post/edit.php
View File

@ -19,6 +19,7 @@ $submitUrl = $post->content->container->createUrl('/post/post/edit', ['id' => $p
<div class="post-richtext-input-group">
<?= $form->field($post, 'message')->widget(RichTextField::class, [
'id' => 'post_input_'. $post->id,
'layout' => RichTextField::LAYOUT_INLINE,
'pluginOptions' => ['maxHeight' => '300px'],
'placeholder' => Yii::t('PostModule.views_edit', 'Edit your post...')
])->label(false) ?>

1
protected/humhub/modules/post/widgets/views/form.php
View File

@ -6,6 +6,7 @@ use humhub\modules\content\widgets\richtext\RichTextField;
<?= RichTextField::widget([
'id' => 'contentForm_message',
'layout' => RichTextField::LAYOUT_INLINE,
'pluginOptions' => ['maxHeight' => '300px'],
'placeholder' => Yii::t("PostModule.widgets_views_postForm", "What's on your mind?"),
'name' => 'message',