Skip to content

Commit b0ffd10

Browse files
author
Gaurav SinghaRoy
committed
adding configured_convert params values
1 parent 8e08bc3 commit b0ffd10

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

app/assets/javascripts/resources/querybuilder.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,9 @@ QueryBuilder = {
626626
var file_data = "";
627627
reader.onload = function(e){
628628
var blocks = QueryBuilder.convert.configured.get_string_blocks(reader.result);
629-
console.log(QueryBuilder.convert.configured.get_block_string_from_blocks(blocks,"variable_dictionary"));
629+
configured_convert.head = QueryBuilder.convert.configured.get_block_string_from_blocks(blocks,"head");
630+
configured_convert.body = QueryBuilder.convert.configured.get_block_string_from_blocks(blocks,"body");
631+
configured_convert.footer = QueryBuilder.convert.configured.get_block_string_from_blocks(blocks,"footer");
630632
};
631633
reader.readAsText(f);
632634
}
@@ -648,13 +650,14 @@ QueryBuilder = {
648650
}
649651
}
650652
else if(inside == true && blocks[i].indexOf("end")){
651-
result = blocks[i-1];
653+
result = blocks[i-1].substring(1,blocks[i-1].length-1);
652654
break_loop = true;
653655
}
654656
}
655657
if(break_loop == true)
656658
break;
657659
}
660+
658661
return result;
659662

660663
},

app/assets/javascripts/resources/variables.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This file will contain any common global variables for javascript
55
*/
66

77
var configured_convert = {
8-
variable_dictionary : [],
8+
variable_dictionary : "",
99
head : "",
1010
body : "",
1111
footer : ""

0 commit comments

Comments
 (0)