old_sql 0.8.0 → 0.9.0

data/app/controllers/old_sql/report_controller.rb

@@ -160,11 +160,12 @@ module OldSql
           field_num+=1
         end
         
-        @fields.to_json
+        @fields.to_json.html_safe
       end
       
       def jqgrid_col_names
-        @reports[@report_name]['fields'].to_json
+        json = @reports[@report_name]['fields'].to_json
+        json.html_safe
       end
       
       def query_vars report

data/app/views/old_sql/report/datagrid.html.erb

@@ -9,11 +9,8 @@ jQuery(document).ready(function(){
     url:"http://<%=@host%>:<%=@port%>/sql/reports/query.json/?report=<%=@report_name%>&report_sql=<%=@report_sql%>&generation=<%=@generation%>&start_date=<%=@start_date%>&end_date=<%=@end_date%>",
   	datatype: "json",
   	pager: false,
-    colNames:['id','name'],
-    colModel:[
-      {name:'id',index:'id', width:55},
-      {name:'name',index:'name', width:100}
-    ],
+    colNames: <%=jqgrid_col_names%>,
+    colModel: <%=jqgrid_col_model%>,
     rowNum:25,
     rowList:[10,20,30],
     width: 777,

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -159,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3465204011877538408
+      hash: -772255520100120061
       segments: 
       - 0
       version: "0"