Upgraded packages

Added editSelf to SingleTIcket view
Fixed issues with counters when using Mongoose 4.0

Author: polonel

app.js

@@ -16,6 +16,7 @@ var async   = require('async'),
     path    = require('path'),
     fs      = require('fs'),
     winston = require('winston'),
+    wConfig = require('winston/lib/winston/config'),
     nconf = require('nconf'),
     pkg     = require('./package.json');
 
@@ -53,7 +54,7 @@ if (!process.send) {
     winston.info('  888 .  888      888   888  888   888  888    .o o.  )88b  888 `88b.');
     winston.info('  "888" d888b     `V88V"V8P\' `Y8bod88P" `Y8bod8P\' 8""888P\' o888o o888o');
     winston.info('==========================================================================');
-    winston.info('TruDesk v' + pkg.version + ' Copyright (C) 2014-2015 Polonel.com');
+    winston.info('TruDesk v' + pkg.version + ' Copyright (C) 2014-2015 Chris Brame');
     winston.info('');
     winston.info('Running in: ' + global.env);
     winston.info('Time: ' + new Date());

package.json

@@ -1,60 +1,60 @@
 {
   "name": "Trudesk",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "start": "node ./app"
   },
   "dependencies": {
     "apn": "^1.7.3",
     "async": "^0.9.0",
-    "bcrypt": "^0.8.1",
-    "body-parser": "^1.12.0",
-    "chance": "^0.7.3",
+    "bcrypt": "^0.8.2",
+    "body-parser": "^1.12.3",
+    "chance": "^0.7.4",
     "connect-flash": "^0.1.1",
-    "connect-mongo": "^0.7.0",
+    "connect-mongo": "^0.8.1",
     "cookie": "^0.1.2",
     "cookie-parser": "^1.3.4",
     "daemon": "^1.1.0",
-    "debug": "^2.1.1",
-    "email-templates": "^1.1.2",
-    "express": "^4.11.2",
-    "express-hbs": "^0.8.0",
-    "express-session": "^1.10.3",
-    "handlebars": "^3.0.0",
-    "lodash": "^3.2.0",
+    "debug": "^2.1.3",
+    "email-templates": "^1.2.1",
+    "express": "^4.12.3",
+    "express-hbs": "^0.8.4",
+    "express-session": "^1.11.1",
+    "handlebars": "^3.0.3",
+    "lodash": "^3.7.0",
     "logrotate-stream": "^0.2.5",
     "marked": "^0.3.3",
-    "moment": "^2.9.0",
-    "mongoose": "^3.8.23",
-    "mongoose-deep-populate": "0.0.7",
-    "morgan": "^1.5.1",
-    "multer": "^0.1.7",
+    "moment": "^2.10.2",
+    "mongoose": "^4.0.2",
+    "mongoose-deep-populate": "1.1.0",
+    "morgan": "^1.5.2",
+    "multer": "^0.1.8",
     "nconf": "^0.7.1",
-    "nodemailer": "^1.3.0",
+    "nodemailer": "^1.3.4",
     "passport": "^0.2.1",
     "passport-http": "^0.2.2",
     "passport-local": "^1.0.0",
-    "passport.socketio": "^3.4.1",
+    "passport.socketio": "^3.5.1",
     "prompt": "^0.2.14",
     "serve-favicon": "^2.2.0",
-    "socket.io": "^1.3.4",
-    "socket.io-client": "^1.3.4",
-    "uglify-js": "^2.4.16",
-    "underscore": "^1.7.0",
+    "socket.io": "^1.3.5",
+    "socket.io-client": "^1.3.5",
+    "uglify-js": "^2.4.20",
+    "underscore": "^1.8.3",
     "underscore.string": "^3.0.3",
     "winston": "^0.9.0"
   },
   "devDependencies": {
     "grunt": "^0.4.5",
-    "grunt-contrib-cssmin": "^0.12.1",
+    "grunt-contrib-cssmin": "^0.12.2",
     "grunt-contrib-sass": "^0.9.2",
-    "grunt-contrib-uglify": "^0.7.0",
+    "grunt-contrib-uglify": "^0.9.1",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-cssc": "^0.2.6",
-    "grunt-express-server": "^0.4.19",
+    "grunt-express-server": "^0.5.1",
     "grunt-htmlhint": "^0.4.1",
-    "grunt-parallel": "^0.3.1",
+    "grunt-parallel": "^0.4.1",
     "matchdep": "^0.3.0"
   }
 }

private/.gitkeep

@@ -130,4 +130,8 @@ var templateDir         = path.resolve(__dirname, '..', 'mailer', 'templates');
         io.sockets.emit('updateComments', ticket);
     });
 
+    emitter.on('notification:added', function(notification) {
+
+    });
+
 })();

src/emitter/events.js

@@ -490,6 +490,19 @@ var helpers = {
         }
     },
 
+    checkEditSelf: function(user, owner, options) {
+        var P = require('../../permissions');
+        if (P.canThis(user.role, 'ticket:editSelf')) {
+            if (user._id.toString() == owner._id.toString()) {
+                return options.fn(this);
+            } else {
+                return options.inverse(this);
+            }
+        }
+
+        return options.inverse(this);
+    },
+
     hasGroup: function(arr, value, options) {
         var result = _.some(arr, function(i) {
             if (_.isUndefined(i) || _.isUndefined(value)) return false;
@@ -516,6 +529,7 @@ helpers.ifLtEq     = helpers.if_lteq;
 helpers.unlessLtEq = helpers.unless_lteq;
 helpers.foreach    = helpers.forEach;
 helpers.canUser    = helpers.checkPerm;
+helpers.canEditSelf = helpers.checkEditSelf;
 helpers.inArray    = helpers.hasGroup;
 
 

src/helpers/hbs/helpers.js

@@ -13,7 +13,7 @@
  **/
 
 var async   = require('async'),
-    _       = require('lodash'),
+    _       = require('underscore'),
     winston = require('winston');
 
 var viewController = {};

src/helpers/viewdata/index.js

@@ -13,7 +13,7 @@
  **/
 
 var mongoose = require('mongoose');
-var _ = require('lodash');
+var _ = require('underscore');
 
 var COLLECTION = 'counters';
 
@@ -22,12 +22,8 @@ var countersSchema = mongoose.Schema({
     next: Number
 });
 
-countersSchema.statics.findAndModify = function (query, sort, doc, options, callback) {
-    return this.collection.findAndModify(query, sort, doc, options, callback);
-};
-
 countersSchema.statics.increment = function (counter, callback) {
-    return this.collection.findAndModify({ _id: counter }, [], { $inc: { next: 1 } }, callback);
+    return this.collection.findOneAndUpdate({ _id: counter }, { $inc: { next: 1 }}, callback);
 };
 
 module.exports = mongoose.model(COLLECTION, countersSchema);

src/models/counters.js

@@ -26,7 +26,7 @@ var historySchema       = require('./history');
 var COLLECTION = 'tickets';
 
 var ticketSchema = mongoose.Schema({
-    uid:        { type: Number },
+    uid:        { type: Number, unique: true},
     owner:      { type: mongoose.Schema.Types.ObjectId, required: true, ref: 'accounts' },
     group:      { type: mongoose.Schema.Types.ObjectId, required: true, ref: 'groups' },
     assignee:   { type: mongoose.Schema.Types.ObjectId, ref: 'accounts' },
@@ -47,13 +47,21 @@ var ticketSchema = mongoose.Schema({
 ticketSchema.plugin(deepPopulate);
 
 ticketSchema.pre('save', function(next) {
-    if (!_.isUndefined(this.uid)|| this.uid) return next();
+    if (!_.isUndefined(this.uid) || this.uid) return next();
 
     var c = require('./counters');
     var self = this;
-    c.increment('tickets', function(err, res) {
-        self.uid = res.next;
-        next();
+    c.increment('tickets', function(err, res, k) {
+        if (err) return next(err);
+
+        self.uid = res.value.next;
+
+        if (_.isUndefined(self.uid)) {
+            var error = new Error('Invalid UID.');
+            return next(error);
+        }
+
+        return next();
     });
 });
 

src/models/ticket.js

@@ -59,6 +59,7 @@ var canThis = function(role, a) {
 
     var actionType = a.split(':')[0];
     var action = a.split(':')[1];
+
     if (_.isUndefined(actionType) || _.isUndefined(action)) return false;
 
     var result = _.filter(rolePerm.allowedAction, function(value) {

src/permissions/index.js

@@ -177,7 +177,7 @@
                                 {{{data.ticket.issue}}}
                             </div>
                         </div>
-                        {{#canUser data.user "tickets:edit"}}
+                        {{#canUser data.user "ticket:edit"}}
                             <div class="edit-issue-form clearfix hide" style="margin-bottom: 15px;">
                                 <form id="edit-issue-form" ng-submit="updateTicketIssue()" data-abide>
                                     <div class="edit-issue-box">
@@ -191,6 +191,22 @@
                                 </form>
                             </div>
                             <div class="edit-issue"><i class="fa fa-pencil fa-lg"></i></div>
+                        {{else}}
+                            {{#canEditSelf data.user data.ticket.owner}}
+                                <div class="edit-issue-form clearfix hide" style="margin-bottom: 15px;">
+                                    <form id="edit-issue-form" ng-submit="updateTicketIssue()" data-abide>
+                                        <div class="edit-issue-box">
+                                            <textarea name="issueText" id="issueText" cols="2" rows="5" data-clearOnSubmit="true" required pattern="is5Long"></textarea>
+                                            <small class="error">Please enter a valid issue. Issue must contain at least 5 characters.</small>
+                                        </div>
+                                        <div class="right">
+                                            <button type="reset" ng-click="editIssueCancelClicked($event)">Cancel</button>
+                                            <button type="submit" data-preventDefault="false">Save</button>
+                                        </div>
+                                    </form>
+                                </div>
+                                <div class="edit-issue"><i class="fa fa-pencil fa-lg"></i></div>
+                            {{/canEditSelf}}
                         {{/canUser}}
                     </div>
                     <div class="comments" data-ticketId="{{data.ticket._id}}">