Mauricio Cattafi / wsimagenes

Download as
Browse Code ยป

Commit 74ab09181d8d5b62596c03b5c2eefb15dc33df98

Authored by Marcelo Puebla
2 parents f410bbf1ed af0fcb1ff4
Exists in master and in 2 other branches develop, lab

Merge branch 'master' into 'master' 

Master(efernandez)

See merge request !2
Showing 3 changed files   Show diff stats
... ... @@ -2296,9 +2296,9 @@
2296 2296 "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
2297 2297 },
2298 2298 "nodemon": {
2299   - "version": "1.19.1",
2300   - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.1.tgz",
2301   - "integrity": "sha512-/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg==",
  2299 + "version": "1.19.2",
  2300 + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.2.tgz",
  2301 + "integrity": "sha512-hRLYaw5Ihyw9zK7NF+9EUzVyS6Cvgc14yh8CAYr38tPxJa6UrOxwAQ351GwrgoanHCF0FalQFn6w5eoX/LGdJw==",
2302 2302 "requires": {
2303 2303 "chokidar": "^2.1.5",
2304 2304 "debug": "^3.1.0",
... ... @@ -3304,9 +3304,9 @@
3304 3304 "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
3305 3305 },
3306 3306 "upath": {
3307   - "version": "1.1.2",
3308   - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
3309   - "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="
  3307 + "version": "1.2.0",
  3308 + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
  3309 + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
3310 3310 },
3311 3311 "update-notifier": {
3312 3312 "version": "2.5.0",
... ... @@ -18,6 +18,6 @@
18 18 "express": "^4.17.1",
19 19 "knex": "^0.19.3",
20 20 "mssql": "^5.1.0",
21   - "nodemon": "^1.19.1"
  21 + "nodemon": "^1.19.2"
22 22 }
23 23 }
... ... @@ -16,16 +16,13 @@ const Articulo = bookshelf.Model.extend({
16 16 router.get('/articulos/:page', (req, res) => {
17 17  
18 18 Articulo
19   - .query((qb) => {
20   - qb.where('NHA', 0);
21   - qb.where('PreVen', '>', 0);
22   - })
23   - .orderBy('id', 'asc')
  19 + .query(() => {})
  20 + .orderBy('id')
24 21 .fetchPage({
25 22 pageSize: 150,
26 23 page: req.params.page,
27 24 withRelated: ['imagenes']
28   - })
  25 + })
29 26 .then(data => {
30 27  
31 28 var promisesCodBar = [];