From 56ad4cdfec41f5b3dbbca357b4730f7db1700b1e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 24 Jun 2016 10:10:10 +0200
Subject: [PATCH] Show error message when posting an invalid comment
When an internal server error occurs while creating or updating a
comment, display a proper error notification in the UI.
---
apps/comments/js/commentstabview.js | Bin 12843 -> 13048 bytes
apps/dav/lib/Comments/CommentNode.php | 2 +-
.../tests/unit/Comments/CommentsNodeTest.php | 6 +++++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index 9475dc53fc059208398833997e90b1db8f38f528..f71567f04d1a9220fecfb1e07d9e7035321c711b 100644
GIT binary patch
delta 297
zcmZ3T@*{P_Gz}I_g=((JjRxwIGc@=oU)C@SE74F-&d<$F%_}KZ*HKV+Eh@?{QpitE
zE-flbO;IS%$jnJqC`v6U%1kZG%u82*s#Pe@EXh#FOi`%LOsNIx15#EnInR_@&CNWT
zvsfnY(vO*(t}QrO-+*JXoSte3F?N*}q$HM*Vw0O59}~Jwro`A(kY9{!k-FyQF9zm}
E0FiKL;s5{u
delta 96
zcmey7x;kaUG!6FL;&e@gYOcu&dg_xiH25c9&@f{LifxY3oW;Thk(~TaCt&hw1J22Q
ZhISyi$p;O^HviK5!H7eC^Fc#%MgYmtBb)#L
diff --git a/apps/dav/lib/Comments/CommentNode.php b/apps/dav/lib/Comments/CommentNode.php
index edf46d210fc..5c22f8a8a71 100644
--- a/apps/dav/lib/Comments/CommentNode.php
+++ b/apps/dav/lib/Comments/CommentNode.php
@@ -185,7 +185,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
$msg = 'Message exceeds allowed character limit of ';
throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e);
}
- return false;
+ throw $e;
}
}
diff --git a/apps/dav/tests/unit/Comments/CommentsNodeTest.php b/apps/dav/tests/unit/Comments/CommentsNodeTest.php
index 6bf06375a43..18b18ab8d3b 100644
--- a/apps/dav/tests/unit/Comments/CommentsNodeTest.php
+++ b/apps/dav/tests/unit/Comments/CommentsNodeTest.php
@@ -166,6 +166,10 @@ class CommentsNodeTest extends \Test\TestCase {
$this->assertTrue($this->node->updateComment($msg));
}
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage buh!
+ */
public function testUpdateCommentLogException() {
$msg = null;
@@ -198,7 +202,7 @@ class CommentsNodeTest extends \Test\TestCase {
$this->logger->expects($this->once())
->method('logException');
- $this->assertFalse($this->node->updateComment($msg));
+ $this->node->updateComment($msg);
}
/**
--
GitLab