Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-27 09:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow undo of topic move

Browse Source
This commit is contained in:
Julian Lam
2020-08-25 21:43:05 -04:00
parent cd8e7963de
commit abb5e81d0d
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/language/en-GB/topic.json
View File

@@ -93,7 +93,8 @@
"thread_tools.merge_topics": "Merge Topics", "thread_tools.merge_topics": "Merge Topics",
"thread_tools.merge": "Merge", "thread_tools.merge": "Merge",
"topic_move_success": "This topic has been successfully moved to %1", "topic_move_success": "This topic has been successfully moved to %1. Click here to undo.",
"topic_move_undone": "Topic move undone",
"post_delete_confirm": "Are you sure you want to delete this post?", "post_delete_confirm": "Are you sure you want to delete this post?",
"post_restore_confirm": "Are you sure you want to restore this post?", "post_restore_confirm": "Are you sure you want to restore this post?",

21
public/src/client/topic/move.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('forum/topic/move', ['categorySelector'], function (categorySelector) { define('forum/topic/move', ['categorySelector', 'alerts'], function (categorySelector, alerts) {
var Move = {}; var Move = {};
var modal; var modal;
var selectedCategory; var selectedCategory;
@@ -58,7 +58,22 @@ define('forum/topic/move', ['categorySelector'], function (categorySelector) {
if (!commitEl.prop('disabled') && selectedCategory && selectedCategory.cid) { if (!commitEl.prop('disabled') && selectedCategory && selectedCategory.cid) {
commitEl.prop('disabled', true); commitEl.prop('disabled', true);
moveTopics(); modal.modal('hide');
alerts.alert({
alert_id: 'tids_move_' + Move.tids.join(';'),
title: '[[topic:thread_tools.move]]',
message: '[[topic:topic_move_success, ' + selectedCategory.name + ']]',
type: 'success',
timeout: 5000,
timeoutfn: function () {
moveTopics();
},
clickfn: function (alert, params) {
delete params.timeoutfn;
app.alertSuccess('[[topic:topic_move_undone]]');
},
});
} }
} }
@@ -72,8 +87,6 @@ define('forum/topic/move', ['categorySelector'], function (categorySelector) {
$(window).trigger('action:topic.move', data); $(window).trigger('action:topic.move', data);
socket.emit(Move.moveAll ? 'topics.moveAll' : 'topics.move', data, function (err) { socket.emit(Move.moveAll ? 'topics.moveAll' : 'topics.move', data, function (err) {
modal.modal('hide');
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }