diff --git a/modules/tickets/server/controllers/mailTickets.server.controller.js b/modules/tickets/server/controllers/mailTickets.server.controller.js
index 2ecad4f5..ca1d99be 100644
--- a/modules/tickets/server/controllers/mailTickets.server.controller.js
+++ b/modules/tickets/server/controllers/mailTickets.server.controller.js
@@ -11,6 +11,22 @@ var path = require('path'),
MailTicket = mongoose.model('MailTicket'),
async = require('async');
+/**
+ * read Messages
+ * @param req
+ * @param res
+ */
+exports.read = function (req, res) {
+ // convert mongoose document to JSON
+ var ticket = req.mailTicket ? req.mailTicket.toJSON() : {};
+
+ // Add a custom field to the Article, for determining if the current User is the "owner".
+ // NOTE: This field is NOT persisted to the database, since it doesn't exist in the Article model.
+ ticket.isCurrentUserOwner = !!(req.user && ticket.user && ticket.user._id.toString() === req.user._id.toString());
+
+ res.json(ticket);
+};
+
/**
* list Messages
* @param req
diff --git a/modules/tickets/server/controllers/messageTickets.server.controller.js b/modules/tickets/server/controllers/messageTickets.server.controller.js
index d025b4f7..43b8fee9 100644
--- a/modules/tickets/server/controllers/messageTickets.server.controller.js
+++ b/modules/tickets/server/controllers/messageTickets.server.controller.js
@@ -7,10 +7,14 @@ var path = require('path'),
config = require(path.resolve('./config/config')),
mongoose = require('mongoose'),
errorHandler = require(path.resolve('./modules/core/server/controllers/errors.server.controller')),
+ multer = require('multer'),
+ fs = require('fs'),
User = mongoose.model('User'),
MessageTicket = mongoose.model('MessageTicket'),
async = require('async');
+var mtDebug = require(path.resolve('./config/lib/debug'));
+
/**
* create a Message
* @param req
@@ -31,6 +35,22 @@ exports.create = function (req, res) {
});
};
+/**
+ * read Messages
+ * @param req
+ * @param res
+ */
+exports.read = function (req, res) {
+ // convert mongoose document to JSON
+ var ticket = req.messageTicket ? req.messageTicket.toJSON() : {};
+
+ // Add a custom field to the Article, for determining if the current User is the "owner".
+ // NOTE: This field is NOT persisted to the database, since it doesn't exist in the Article model.
+ ticket.isCurrentUserOwner = !!(req.user && ticket.from && ticket.from._id.toString() === req.user._id.toString());
+
+ res.json(ticket);
+};
+
/**
* list Messages
* @param req
@@ -103,35 +123,16 @@ exports.list = function (req, res) {
*/
exports.delete = function (req, res) {
if (req.user.isOper) {
- if (req.params.messageId) {
- var message = req.messageTicket;
- message.remove(function (err) {
- if (err) {
- return res.status(422).send({
- message: errorHandler.getErrorMessage(err)
- });
- } else {
- res.json(message);
- }
- });
-
- } else {
- if (req.query.ids) {
- MessageTicket.remove({
- _id: {$in: req.query.ids}
- }, function (err) {
- if (err) {
- return res.status(422).send({
- message: errorHandler.getErrorMessage(err)
- });
- } else {
- return res.status(200).send({
- message: 'delete successfully'
- });
- }
+ var message = req.messageTicket;
+ message.remove(function (err) {
+ if (err) {
+ return res.status(422).send({
+ message: errorHandler.getErrorMessage(err)
});
+ } else {
+ res.json(message);
}
- }
+ });
} else {
return res.status(403).json({
message: 'SERVER.USER_IS_NOT_AUTHORIZED'
@@ -145,6 +146,8 @@ exports.delete = function (req, res) {
exports.update = function (req, res) {
var message = req.messageTicket;
+ message.title = req.body.title;
+ message.content = req.body.content;
message.updatedAt = Date.now();
message.save(function (err) {
@@ -165,11 +168,31 @@ exports.update = function (req, res) {
*/
exports.createReply = function (req, res) {
var reply = new MessageTicket(req.body);
+ reply.from = req.user._id;
var message = req.messageTicket;
message._replies.push(reply);
message.updatedAt = Date.now();
+ //replace content path
+ var tmp = config.uploads.tickets.image.temp.substr(1);
+ var dst = config.uploads.tickets.image.dest.substr(1);
+
+ var regex = new RegExp(tmp, 'g');
+ reply.content = reply.content.replace(regex, dst);
+
+ //move temp torrent file to dest directory
+ req.body._uImage.forEach(function (f) {
+ var oldPath = config.uploads.tickets.image.temp + f.filename;
+ var newPath = config.uploads.tickets.image.dest + f.filename;
+ move(oldPath, newPath, function (err) {
+ if (err) {
+ mtDebug.debugRed(err);
+ }
+ });
+ });
+
+ //message save
message.save(function (err) {
if (err) {
return res.status(422).send({
@@ -192,6 +215,171 @@ exports.createReply = function (req, res) {
});
};
+/**
+ * move file
+ * @param oldPath
+ * @param newPath
+ * @param callback
+ */
+function move(oldPath, newPath, callback) {
+ fs.rename(oldPath, newPath, function (err) {
+ if (err) {
+ if (err.code === 'EXDEV') {
+ copy();
+ } else {
+ callback(err);
+ }
+ return;
+ }
+ callback();
+ });
+
+ function copy() {
+ var readStream = fs.createReadStream(oldPath);
+ var writeStream = fs.createWriteStream(newPath);
+
+ readStream.on('error', callback);
+ writeStream.on('error', callback);
+
+ readStream.on('close', function () {
+ fs.unlink(oldPath, callback);
+ });
+ readStream.pipe(writeStream);
+ }
+}
+
+/**
+ * uploadTicketImage
+ * @param req
+ * @param res
+ */
+exports.uploadTicketImage = function (req, res) {
+ var user = req.user;
+ var createUploadTicketImageFilename = require(path.resolve('./config/lib/multer')).createUploadTicketImageFilename;
+ var getUploadTicketImageDestination = require(path.resolve('./config/lib/multer')).getUploadTicketImageDestination;
+ var fileFilter = require(path.resolve('./config/lib/multer')).imageFileFilter;
+ var imageInfo = {};
+
+ var storage = multer.diskStorage({
+ destination: getUploadTicketImageDestination,
+ filename: createUploadTicketImageFilename
+ });
+
+ var upload = multer({
+ storage: storage,
+ fileFilter: fileFilter,
+ limits: config.uploads.tickets.image.limits
+ }).single('newTicketImageFile');
+
+ if (user) {
+ uploadFile()
+ .then(function () {
+ res.status(200).send(imageInfo);
+ })
+ .catch(function (err) {
+ res.status(422).send(err);
+ mtDebug.debugRed(err);
+
+ if (req.file && req.file.filename) {
+ var newfile = config.uploads.tickets.image.temp + req.file.filename;
+ if (fs.existsSync(newfile)) {
+ mtDebug.debugRed(err);
+ mtDebug.debugRed('ERROR: DELETE TEMP TICKET IMAGE FILE: ' + newfile);
+ fs.unlinkSync(newfile);
+ }
+ }
+ });
+ } else {
+ res.status(401).send({
+ message: 'User is not signed in'
+ });
+ }
+
+ function uploadFile() {
+ return new Promise(function (resolve, reject) {
+ upload(req, res, function (uploadError) {
+ if (uploadError) {
+ var message = errorHandler.getErrorMessage(uploadError);
+
+ if (uploadError.code === 'LIMIT_FILE_SIZE') {
+ message = 'Ticket image file too large. Maximum size allowed is ' + (config.uploads.tickets.image.limits.fileSize / (1024 * 1024)).toFixed(2) + ' Mb files.';
+ }
+
+ reject(message);
+ } else {
+ imageInfo.filename = req.file.filename;
+ resolve();
+ }
+ });
+ });
+ }
+};
+
+/**
+ * deleteReply
+ * @param req
+ * @param res
+ */
+exports.deleteReply = function (req, res) {
+ var message = req.messageTicket;
+
+ message._replies.forEach(function (r) {
+ if (r._id.equals(req.params.replyId)) {
+
+ if (!canEdit(req.user) && !isOwner(req.user, r)) {
+ return res.status(403).json({
+ message: 'SERVER.USER_IS_NOT_AUTHORIZED'
+ });
+ } else {
+ message._replies.pull(r);
+ message.markModified('_replies');
+
+ message.save(function (err) {
+ if (err) {
+ return res.status(422).send({
+ message: errorHandler.getErrorMessage(err)
+ });
+ } else {
+ res.json(message);
+ }
+ });
+ }
+ }
+ });
+};
+
+/**
+ * updateReply
+ * @param req
+ * @param res
+ */
+exports.updateReply = function (req, res) {
+ var message = req.messageTicket;
+
+ message._replies.forEach(function (r) {
+ if (r._id.equals(req.params.replyId)) {
+
+ if (!canEdit(req.user) && !isOwner(req.user, r)) {
+ return res.status(403).json({
+ message: 'SERVER.USER_IS_NOT_AUTHORIZED'
+ });
+ }
+
+ r.content = req.body.content;
+ message.markModified('_replies');
+ message.save(function (err) {
+ if (err) {
+ return res.status(422).send({
+ message: errorHandler.getErrorMessage(err)
+ });
+ } else {
+ res.json(message);
+ }
+ });
+ }
+ });
+};
+
/**
* Invitation middleware
*/
@@ -221,3 +409,35 @@ exports.messageTicketById = function (req, res, next, id) {
});
};
+/**
+ * canEdit
+ * @param u, req.user
+ * @param f, forum
+ * @returns {boolean}
+ */
+function canEdit(u) {
+ if (u.isOper) {
+ return true;
+ } else if (u.isAdmin) {
+ return true;
+ } else {
+ return false;
+ }
+}
+
+/**
+ * isOwner
+ * @param o, topic or reply object
+ * @returns {boolean}
+ */
+function isOwner(u, o) {
+ if (o) {
+ if (o.from._id.equals(u._id)) {
+ return true;
+ } else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+}
diff --git a/modules/tickets/server/policies/tickets.server.policy.js b/modules/tickets/server/policies/tickets.server.policy.js
index 508f6c59..236537ae 100644
--- a/modules/tickets/server/policies/tickets.server.policy.js
+++ b/modules/tickets/server/policies/tickets.server.policy.js
@@ -19,8 +19,11 @@ exports.invokeRolesPolicies = function () {
allows: [
{resources: '/api/messageTickets', permissions: '*'},
{resources: '/api/messageTickets/:messageTicketId', permissions: '*'},
+ {resources: '/api/messageTickets/:messageTicketId/:replyId', permissions: '*'},
{resources: '/api/mailTickets', permissions: '*'},
- {resources: '/api/mailTickets/:mailTicketId', permissions: '*'}
+ {resources: '/api/mailTickets/:mailTicketId', permissions: '*'},
+ {resources: '/api/mailTickets/:mailTicketId/:replyId', permissions: '*'},
+ {resources: '/api/messageTickets/uploadTicketImage', permissions: '*'}
]
}
]
diff --git a/modules/tickets/server/routes/tickets.server.routes.js b/modules/tickets/server/routes/tickets.server.routes.js
index 3e724f9b..7bf5076f 100644
--- a/modules/tickets/server/routes/tickets.server.routes.js
+++ b/modules/tickets/server/routes/tickets.server.routes.js
@@ -10,23 +10,32 @@ var ticketsPolicy = require('../policies/tickets.server.policy'),
module.exports = function (app) {
app.route('/api/messageTickets').all(ticketsPolicy.isAllowed)
.get(messageTickets.list)
- .post(messageTickets.create)
- .delete(messageTickets.delete);
+ .post(messageTickets.create);
+
+ app.route('/api/messageTickets/uploadTicketImage').all(ticketsPolicy.isAllowed)
+ .post(messageTickets.uploadTicketImage);
app.route('/api/messageTickets/:messageTicketId').all(ticketsPolicy.isAllowed)
+ .get(messageTickets.read)
.delete(messageTickets.delete)
.put(messageTickets.update)
.post(messageTickets.createReply);
+ app.route('/api/messageTickets/:messageTicketId/:replyId').all(ticketsPolicy.isAllowed)
+ .delete(messageTickets.deleteReply)
+ .put(messageTickets.updateReply);
+
+
app.route('/api/mailTickets').all(ticketsPolicy.isAllowed)
.get(mailTickets.list)
.delete(mailTickets.delete);
app.route('/api/mailTickets/:mailTicketId').all(ticketsPolicy.isAllowed)
+ .get(mailTickets.read)
.delete(mailTickets.delete)
.put(mailTickets.update)
.post(mailTickets.createReply);
app.param('messageTicketId', messageTickets.messageTicketById);
- app.param('messageTicketId', mailTickets.mailTicketById);
+ app.param('mailTicketId', mailTickets.mailTicketById);
};
' + '' + value + '';
+ },
+ replace: function (value) {
+ return ':' + value + ': ';
+ },
+ index: 1
+ }
+ ]);
+
+ e.setContent(t.content);
+ $('#' + e.$editor.attr('id') + ' .md-input').attr('maxlength', vm.inputLengthConfig.ticketContentLength);
+
+ var inputInfo = angular.element('');
+ inputInfo.addClass('pull-right');
+ inputInfo.addClass('input-length');
+ inputInfo.text(e.getContent().length + '/' + vm.inputLengthConfig.ticketContentLength);
+ $('#' + e.$editor.attr('id') + ' .md-header').append(inputInfo);
+ $('#' + e.$editor.attr('id') + ' .md-input').on('input propertychange', function (evt) {
+ inputInfo.text(e.getContent().length + '/' + vm.inputLengthConfig.ticketContentLength);
+ });
+
+ var ele = $('#' + e.$editor.attr('id') + ' .md-footer');
+ angular.element(ele).addClass('text-right');
+ angular.element(ele[0].childNodes[0]).addClass('btn-width-80');
+ ele[0].childNodes[0].innerText = $translate.instant('FORUMS.BTN_SAVE');
+
+ var cbtn = angular.element('');
+ cbtn.bind('click', function (evt) {
+ e.setContent(t.content);
+ e.$options.hideable = true;
+ e.blur();
+ });
+
+ ele.append(cbtn);
+ $compile(e.$editor.contents())($scope);
+ },
+ onPreview: function (e) {
+ $('#' + e.$editor.attr('id') + ' .md-footer').css('display', 'none');
+ },
+ onPreviewEnd: function (e) {
+ $('#' + e.$editor.attr('id') + ' .md-footer').css('display', 'block');
+ }
+ });
+ };
+
+ /**
+ * beginEditReply
+ * @param r
+ */
+ vm.beginEditReply = function (r) {
+ var el = $('#' + r._id);
+
+ el.markdown({
+ autofocus: true,
+ savable: true,
+ hideable: true,
+ iconlibrary: 'fa',
+ resize: 'vertical',
+ language: localStorageService.get('storage_user_lang'),
+ fullscreen: {enable: false},
+ onSave: function (e) {
+ if (e.isDirty()) {
+ //save content
+ var rep = new MessageTicketsService({
+ _id: vm.ticket._id,
+ _rid: r._id,
+ content: e.getContent()
+ });
+
+ rep.$update(function (res) {
+ vm.ticket = res;
+ vm.figureOutItemsToDisplay();
+ NotifycationService.showSuccessNotify('FORUMS.REPLY_EDIT_SUCCESSFULLY');
+ }, function (res) {
+ NotifycationService.showErrorNotify(res.data.message, 'FORUMS.REPLY_EDIT_FAILED');
+ });
+
+ e.$options.hideable = true;
+ e.blur();
+ } else {
+ e.$options.hideable = true;
+ e.blur();
+ }
+ },
+ onChange: function (e) {
+ e.$options.hideable = false;
+ },
+ onShow: function (e) {
+ $('#' + e.$editor.attr('id') + ' .md-input').textcomplete([
+ { // emoji strategy
+ match: /\B:([\-+\w]*)$/,
+ search: function (term, callback) {
+ callback($.map(window.emojies, function (emoji) {
+ return emoji.indexOf(term) === 0 ? emoji : null;
+ }));
+ },
+ template: function (value) {
+ return '