Skip to content

Commit

Permalink
Merge pull request #28 from ShaneK/feature/updating
Browse files Browse the repository at this point in the history
v1.2.0
  • Loading branch information
ShaneK committed Apr 10, 2016
2 parents 08b443e + 021d22f commit f080435
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
18 changes: 9 additions & 9 deletions controllers/jobs.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,39 @@ var redisModel = require('../models/redis');

module.exports = function (app) {
app.get('/api/jobs/pending/status/:type', function (req, res) {
var type = req.param("type");
var type = req.params['type'];
redisModel.makePendingByType(type).done(function(results){
res.json(results);
});
});

app.get('/api/jobs/pending/id/:type/:id', function (req, res) {
var id = req.param("id"),
type = req.param("type");
var id = req.params['id'],
type = req.params['type'];
redisModel.makePendingById(type, id).done(function(results){
res.json(results);
});
});

app.get('/api/jobs/delete/status/:type', function (req, res) {
var type = req.param("type");
var queueName = req.param("queueName") ? req.param("queueName") : null;
var type = req.params['type'];
var queueName = req.params['queueName'] ? req.params['queueName'] : null;
redisModel.deleteJobByStatus(type, queueName).done(function(results){
res.json(results);
});
});

app.get('/api/jobs/delete/id/:type/:id', function (req, res) {
var id = req.param("id"),
type = req.param("type");
var id = req.params['id'],
type = req.params['type'];
redisModel.deleteJobById(type, id).done(function(results){
res.json(results);
});
});

app.get('/api/jobs/info/:type/:id', function(req, res){
var id = req.param("id"),
type = req.param("type");
var id = req.params['id'],
type = req.params['type'];
redisModel.getDataById(type, id).done(function(results){
res.json(results);
});
Expand Down
2 changes: 1 addition & 1 deletion lib/setupAndMiddleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = function(app, options){
//Enforce that redis is connected to, will make render an error page if not connected
app.use(redisConnectionEnforcer);

app.use(bodyParser.urlencoded({}));
app.use(bodyParser.urlencoded({extended: true}));

//Publicly accessible routes
app.use('/css/', express.static(__dirname + '/../public/css'));
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "bull-ui",
"version": "1.1.0",
"version": "1.2.0",
"description": "Front-end web interface for Bull Job Manager",
"main": "index.js",
"dependencies": {
"bluebird": "^2.9.24",
"body-parser": "^1.13.3",
"bull": "^0.7.2",
"bull": "^1.0.0-rc1",
"consolidate": "~0.10.0",
"dustjs-linkedin": "~2.5.1",
"express": "~4.10.8",
"express": "^4.13.4",
"less": "~2.1.2",
"lodash": "~2.4.1",
"q": "~1.1.2",
Expand Down

0 comments on commit f080435

Please sign in to comment.