mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-06-28 21:55:30 +02:00
Code Issues Releases Wiki Activity

Temporary fix for read marking

Browse Source
This commit is contained in:
Toby Zerner
2015-02-26 12:46:27 +10:30
parent b4f3148e30
commit c09e47c434
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ember/app/controllers/discussion.js
View File

@ -94,7 +94,7 @@ export default Ember.Controller.extend(Ember.Evented, UseComposerMixin, {
this.set('start', startNumber); this.set('start', startNumber);
var discussion = this.get('model'); var discussion = this.get('model');
if (endNumber > discussion.get('readNumber')) { if (endNumber > discussion.get('readNumber') && this.get('session.isAuthenticated')) {
discussion.set('readNumber', endNumber); discussion.set('readNumber', endNumber);
discussion.save(); discussion.save();
} }

7
src/Api/Actions/Discussions/UpdateAction.php
View File

@ -25,9 +25,14 @@ class UpdateAction extends BaseAction
// As usual, however, we will fire an event to allow plugins to update // As usual, however, we will fire an event to allow plugins to update
// additional properties. // additional properties.
if ($data = array_except($params->get('discussions'), ['readNumber'])) { if ($data = array_except($params->get('discussions'), ['readNumber'])) {
try {
$command = new EditDiscussionCommand($discussionId, $user); $command = new EditDiscussionCommand($discussionId, $user);
$this->hydrate($command, $params->get('discussions')); $this->hydrate($command, $params->get('discussions'));
$discussion = $this->dispatch($command, $params); $discussion = $this->dispatch($command, $params);
} catch (PermissionDeniedException $e) {
// Temporary fix. See @todo below
$discussion = \Flarum\Core\Models\Discussion::find($discussionId);
}
} }
// Next, if a read number was specified in the request, we will run the // Next, if a read number was specified in the request, we will run the
@ -35,7 +40,7 @@ class UpdateAction extends BaseAction
// //
// @todo Currently, if the user doesn't have permission to edit a // @todo Currently, if the user doesn't have permission to edit a
// discussion, they're unable to update their readNumber because a // discussion, they're unable to update their readNumber because a
// PermissionsDeniedException is thrown by the // PermissionDeniedException is thrown by the
// EditDiscussionCommand above. So this needs to be extracted into // EditDiscussionCommand above. So this needs to be extracted into
// its own endpoint. // its own endpoint.
if ($readNumber = $params->get('discussions.readNumber')) { if ($readNumber = $params->get('discussions.readNumber')) {