mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-19 23:54:54 +01:00
Code Issues Projects Releases Wiki Activity

#4396 Removed redundant is_nul(), $form->create() and used save() instead. Use $comment in validation rule.

Browse Source
This commit is contained in:
Master_Hans 2020-10-02 16:41:39 +03:00
parent 789ec08478
commit 51c9941c7e
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
protected/humhub/modules/comment/controllers/CommentController.php
View File

@ -131,9 +131,9 @@ class CommentController extends Controller
return Comment::getDb()->transaction(function ($db) {
$form = new CommentForm($this->target);
$form = new CommentForm($this->target, new Comment(['message' => Yii::$app->request->post('message')]));
if ($form->load(Yii::$app->request->post()) && $form->create()) {
if ($form->load(Yii::$app->request->post()) && $form->save()) {
return $this->renderAjaxContent(CommentWidget::widget(['comment' => $form->comment]));
} else {
return false;
@ -146,16 +146,13 @@ class CommentController extends Controller
{
$comment = Comment::findOne(['id' => Yii::$app->request->get('id')]);
// Find all file attached to this comment
$fileList = $comment->fileManager->findAll();
if (!$comment->canEdit()) {
throw new HttpException(403, Yii::t('CommentModule.base', 'Access denied!'));
}
$form = new CommentForm($this->target, $fileList);
$form = new CommentForm($this->target, $comment);
if ($form->load(Yii::$app->request->post()) && $form->update($comment)) {
if ($form->load(Yii::$app->request->post()) && $form->update()) {
return $this->renderAjaxContent(CommentWidget::widget([
'comment' => $form->comment,
'justEdited' => true

55
protected/humhub/modules/comment/models/forms/CommentForm.php
View File

@ -15,19 +15,32 @@ use yii\web\ServerErrorHttpException;
*/
class CommentForm extends yii\base\Model
{
/**
* Comment message
* @var string
*/
public $message;
/**
* The list of files attached to a comment
* @var array
*/
public $fileList;
/**
* @var Comment The model to comment
*/
public $comment;
/**
* @var Comment|ContentActiveRecord The model to comment
* @var Comment|ContentActiveRecord The model to comment or other active content
*/
public $target;
public function __construct($target, $fileList = null)
public function __construct($target, $comment)
{
$this->target = $target;
$this->fileList = $fileList;
$this->comment = $comment;
parent::__construct();
}
@ -38,7 +51,7 @@ class CommentForm extends yii\base\Model
{
return [
[['message'], 'required', 'isEmpty' => function ($message) {
$hasFile = !is_null($this->fileList) && !empty($this->fileList) ? true : false;
$hasFile = !empty($this->fileList) || (!$this->comment->isNewRecord && $this->comment->fileManager->find()->count());
//check if message empty and attached file exists
if (empty($message) && !$hasFile) {
@ -79,47 +92,35 @@ class CommentForm extends yii\base\Model
return '';
}
/**
* Creates the form
*
* @return Comment|boolean
*/
public function create()
{
$comment = new Comment(['message' => $this->message]);
return $this->save($comment);
}
/**
* Updates the form
*
* @param Comment $comment
* @return Comment|boolean
* @return boolean
*/
public function update($comment)
public function update()
{
$comment->message = $this->message;
return $this->save($comment);
$this->comment->message = $this->message;
return $this->save();
}
/**
* Saves the form
*
* @param Comment $comment
* @return Comment|boolean
* @return boolean
*/
public function save($comment)
public function save()
{
$comment->setPolyMorphicRelation($this->target);
/**@var Comment $this->comment*/
$this->comment->setPolyMorphicRelation($this->target);
//check if model saved
if ($comment->save()) {
$comment->fileManager->attach($this->fileList);
if ($this->comment->save()) {
$this->comment->fileManager->attach($this->fileList);
// Reload comment to get populated created_at field
$comment->refresh();
$this->comment = $comment;
$this->comment->refresh();
return true;
} else {
return false;