From d6b010387a673a0777d14822becf59b7870304a9 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Thu, 8 Feb 2018 13:06:12 +0100 Subject: [PATCH 1/3] service auth package md5 --- services/auth/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/auth/package.json b/services/auth/package.json index c7564c7c7..f959ddc95 100644 --- a/services/auth/package.json +++ b/services/auth/package.json @@ -7,7 +7,9 @@ "start": "node .", "posttest": "npm run lint && nsp check" }, - "dependencies": {}, + "dependencies": { + "md5": "^2.2.1" + }, "repository": { "type": "git", "url": "https://git.verdnatura.es/salix" From 725fe790221d3b86f8e28bb6d9d1568e21f31636 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Thu, 8 Feb 2018 13:11:15 +0100 Subject: [PATCH 2/3] package md5 --- package.json | 1 - services/loopback/package.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb43736ed..440460fe6 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "karma-jasmine": "^1.1.1", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^2.0.9", - "md5": "^2.2.1", "merge-stream": "^1.0.1", "mustache": "^2.3.0", "mysql": "^2.15.0", diff --git a/services/loopback/package.json b/services/loopback/package.json index 40637ceb0..9331b19d8 100644 --- a/services/loopback/package.json +++ b/services/loopback/package.json @@ -15,6 +15,7 @@ "loopback-connector-mysql": "^3.0.0", "loopback-connector-remote": "^3.1.1", "loopback-context": "^3.3.0", + "md5": "^2.2.1", "serve-favicon": "^2.0.1", "strong-error-handler": "^2.1.0" }, From f7ea8e6435f6724219604f8a37f730bd8eff8a27 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 8 Feb 2018 13:13:42 +0100 Subject: [PATCH 3/3] watcher lint --- client/core/src/watcher/watcher.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/client/core/src/watcher/watcher.js b/client/core/src/watcher/watcher.js index cdcd2974a..18ce80117 100644 --- a/client/core/src/watcher/watcher.js +++ b/client/core/src/watcher/watcher.js @@ -47,7 +47,7 @@ export default class Watcher extends Component { fetchData() { let id = this.data[this.idField]; - // return new Promise((resolve, reject) => { + // return new Promise((resolve, reject) => { this.$http.get(`${this.url}/${id}`).then( json => { this.data = copyObject(json.data); @@ -55,26 +55,33 @@ export default class Watcher extends Component { } // json => reject(json) ); - // }); + // }); } + /** * Submits the data and goes back in the history. + * + * @return {Promise} The request promise */ submitBack() { return this.submit().then( () => this.window.history.back() ); } + /** * Submits the data and goes another state. * * @param {String} state The state name + * @param {Object} params The request params + * @return {Promise} The request promise */ submitGo(state, params) { return this.submit().then( () => this.$state.go(state, params || {}) ); } + /** * Submits the data to the server. *