Merge pull request #5 from JonasWissing/master

minor changes
geo-c · Oct 13, 2017 · f7f0229 · f7f0229
2 parents 0b4ed01 + db8ea99
commit f7f0229
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 22 deletions.
diff --git a/controllers/submit/submit.js b/controllers/submit/submit.js
@@ -10,8 +10,6 @@ var validate = ajv.compile(schema);
 
 // POST
 exports.request = function(req, res) {
- console.log("SUBMIT SOME DATA");
- console.log(req.body);
  var valid = validate(req.body);
  if (!valid) {
  res.status(errors.schema.error_1.code).send(_.extend(errors.schema.error_1, {

diff --git a/public/configure/js/Form.js b/public/configure/js/Form.js
@@ -156,15 +156,15 @@ Form.prototype.Postgres = function (categories, modify) {
  $('#panelQuery').append(this.elements.queryDescription());
  //Category
  this.Categories(categories);
-
+ var that = this;
  if(modify) {
  this.btnSend("Send", function (e) {
  alert(e);
  });
  } else {
  this.btnSend("Send", function (e) {
  alert(e);
- this.Table.Queries();
+ that.Table.Queries();
  });
  } 
 }
@@ -194,15 +194,15 @@ Form.prototype.API = function (categories, modify) {
  $('#panelQuery').append(this.elements.queryDescription());
  //Category
  this.Categories(categories);
-
+ var that = this;
  if(modify) {
  this.btnSend("Send", function (e) {
  alert(e);
  });
  } else {
  this.btnSend("Send", function (e) {
  alert(e);
- this.Table.Queries();
+ that.Table.Queries();
  });
  } 
 }
@@ -234,15 +234,15 @@ Form.prototype.CouchDB = function (categories, modify) {
  $('#panelQuery').append(this.elements.queryDescription());
  //Category
  this.Categories(categories);
-
+ var that = this;
  if(modify) {
  this.btnSend("Send", function (e) {
  alert(e);
  });
  } else {
  this.btnSend("Send", function (e) {
  alert(e);
- this.Table.Queries();
+ that.Table.Queries();
  });
  } 
 }
@@ -269,14 +269,15 @@ Form.prototype.Parliament = function (categories, modify) {
  $('#panelQuery').append(this.elements.queryDescription());
  //Category
  this.Categories(categories);
+ var that = this;
  if(modify) {
  this.btnSend("Send", function (e) {
  alert(e);
  });
  } else {
  this.btnSend("Send", function (e) {
  alert(e);
- this.Table.Queries();
+ that.Table.Queries();
  });
  } 
 }
@@ -401,8 +402,6 @@ Form.prototype.btnSend = function (text, callback) {
 
  //Listen on Button Clicks
  $btnSend.click(function (e) {
- console.log(that.status);
- console.log(that)
  submit = new Submit(that.user, that.categories);
  submit.submit(that.status, callback);
  //Check which status is active

diff --git a/public/configure/js/Table.js b/public/configure/js/Table.js
@@ -115,11 +115,11 @@ Table.prototype.Queries = function () {
  if(json[index].ds_port != null && json[index].ds_port != "") {
  _dsUrl += ":" + json[index].ds_port+"/";
  }
- if(json[index].query_intern.replace("<", "&lt;").replace(">", "&gt;").length > 13) {
+ if(json[index].query_intern.replace(/\</g, "&lt;").replace(/\>/g, "&gt;").length > 13) {
  that.data.push([
  json[index].query_id,
  json[index].query_extern,
- json[index].query_intern.replace("<", "&lt;").replace(">", "&gt;").substring(0,10) + '...',
+ json[index].query_intern.replace(/\</g, "&lt;").replace(/\>/g, "&gt;").substring(0,10) + '...',
  json[index].query_description,
  json[index].category_name,
  _url,
@@ -130,7 +130,7 @@ Table.prototype.Queries = function () {
  that.data.push([
  json[index].query_id,
  json[index].query_extern,
- json[index].query_intern.replace("<", "&lt;").replace(">", "&gt;"),
+ json[index].query_intern.replace(/\</g, "&lt;").replace(/\>/g, "&gt;"),
  json[index].query_description,
  json[index].category_name,
  _url,
@@ -141,7 +141,7 @@ Table.prototype.Queries = function () {
  that.data_all.push([
  json[index].query_id,
  json[index].query_extern,
- json[index].query_intern.replace("<", "&lt;").replace(">", "&gt;"),
+ json[index].query_intern.replace(/\</g, "&lt;").replace(/\>/g, "&gt;"),
  json[index].query_description,
  json[index].category_name,
  _url,
@@ -192,11 +192,11 @@ Table.prototype.QueriesByUser = function (username, form) {
  if(json[index].ds_port != null && json[index].ds_port != "") {
  _dsUrl += ":" + json[index].ds_port+"/";
  }
- if(json[index].query_intern.replace("<", "&lt;").replace(">", "&gt;").length > 13) {
+ if(json[index].query_intern.replace(/\</g, "&lt;").replace(/\>/g, "&gt;").length > 13) {
  that.data.push([
  json[index].query_id,
  json[index].query_extern,
- json[index].query_intern.replace("<", "&lt;").replace(">", "&gt;").substring(0,10) + '...',
+ json[index].query_intern.replace(/\</g, "&lt;").replace(/\>/g, "&gt;").substring(0,10) + '...',
  json[index].query_description,
  json[index].category_name,
  _url,
@@ -207,7 +207,7 @@ Table.prototype.QueriesByUser = function (username, form) {
  that.data.push([
  json[index].query_id,
  json[index].query_extern,
- json[index].query_intern.replace("<", "&lt;").replace(">", "&gt;"),
+ json[index].query_intern.replace(/\</g, "&lt;").replace(/\>/g, "&gt;"),
  json[index].query_description,
  json[index].category_name,
  _url,
@@ -218,7 +218,7 @@ Table.prototype.QueriesByUser = function (username, form) {
  that.data_all.push([
  json[index].query_id,
  json[index].query_extern,
- json[index].query_intern.replace("<", "&lt;").replace(">", "&gt;"),
+ json[index].query_intern.replace(/\</g, "&lt;").replace(/\>/g, "&gt;"),
  json[index].query_description,
  json[index].category_name,
  _url,
@@ -251,10 +251,7 @@ Table.prototype.QueriesByUser = function (username, form) {
  * Expand Table to show more Information
  */
 Table.prototype.moreInfo = function (data) {
- console.log(this.data_all);
- console.log(data);
  for(i in this.data_all) {
- console.log(this.data_all[i][1])
  if(this.data_all[i][1] == data) {
  return '<center><code>' + this.data_all[i][2] + '</code></center>';
  }