Skip to content

Commit f080435

Browse files
committed
Merge pull request #28 from ShaneK/feature/updating
v1.2.0
2 parents 08b443e + 021d22f commit f080435

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

controllers/jobs.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,39 @@ var redisModel = require('../models/redis');
55

66
module.exports = function (app) {
77
app.get('/api/jobs/pending/status/:type', function (req, res) {
8-
var type = req.param("type");
8+
var type = req.params['type'];
99
redisModel.makePendingByType(type).done(function(results){
1010
res.json(results);
1111
});
1212
});
1313

1414
app.get('/api/jobs/pending/id/:type/:id', function (req, res) {
15-
var id = req.param("id"),
16-
type = req.param("type");
15+
var id = req.params['id'],
16+
type = req.params['type'];
1717
redisModel.makePendingById(type, id).done(function(results){
1818
res.json(results);
1919
});
2020
});
2121

2222
app.get('/api/jobs/delete/status/:type', function (req, res) {
23-
var type = req.param("type");
24-
var queueName = req.param("queueName") ? req.param("queueName") : null;
23+
var type = req.params['type'];
24+
var queueName = req.params['queueName'] ? req.params['queueName'] : null;
2525
redisModel.deleteJobByStatus(type, queueName).done(function(results){
2626
res.json(results);
2727
});
2828
});
2929

3030
app.get('/api/jobs/delete/id/:type/:id', function (req, res) {
31-
var id = req.param("id"),
32-
type = req.param("type");
31+
var id = req.params['id'],
32+
type = req.params['type'];
3333
redisModel.deleteJobById(type, id).done(function(results){
3434
res.json(results);
3535
});
3636
});
3737

3838
app.get('/api/jobs/info/:type/:id', function(req, res){
39-
var id = req.param("id"),
40-
type = req.param("type");
39+
var id = req.params['id'],
40+
type = req.params['type'];
4141
redisModel.getDataById(type, id).done(function(results){
4242
res.json(results);
4343
});

lib/setupAndMiddleware.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = function(app, options){
2020
//Enforce that redis is connected to, will make render an error page if not connected
2121
app.use(redisConnectionEnforcer);
2222

23-
app.use(bodyParser.urlencoded({}));
23+
app.use(bodyParser.urlencoded({extended: true}));
2424

2525
//Publicly accessible routes
2626
app.use('/css/', express.static(__dirname + '/../public/css'));

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "bull-ui",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"description": "Front-end web interface for Bull Job Manager",
55
"main": "index.js",
66
"dependencies": {
77
"bluebird": "^2.9.24",
88
"body-parser": "^1.13.3",
9-
"bull": "^0.7.2",
9+
"bull": "^1.0.0-rc1",
1010
"consolidate": "~0.10.0",
1111
"dustjs-linkedin": "~2.5.1",
12-
"express": "~4.10.8",
12+
"express": "^4.13.4",
1313
"less": "~2.1.2",
1414
"lodash": "~2.4.1",
1515
"q": "~1.1.2",

0 commit comments

Comments
 (0)