File 41a6f832fe7de926f1f48449235a3aba643c70aa.patch of Package Snorby

File 41a6f832fe7de926f1f48449235a3aba643c70aa.patch of Package Snorby (Revision 32)

Currently displaying revision 32, show latest

commit 41a6f832fe7de926f1f48449235a3aba643c70aa
Author: Dustin Willis Webber <dustin.webber@gmail.com>
Date:   Thu Jan 10 19:33:03 2013 -0600

fix pdf graph issue

diff --git a/app/views/page/dashboard.pdf.erb b/app/views/page/dashboard.pdf.erb
index c7322ca..e723f72 100644
--- a/app/views/page/dashboard.pdf.erb
+++ b/app/views/page/dashboard.pdf.erb
@@ -30,7 +30,7 @@
 	      },
 				plotOptions: { series: { enableMouseTracking: false, shadow: false, animation: false } },
 	      xAxis: {
-					categories: [<%= @axis %>],
+        categories: [<%= @axis.try(:html_safe) %>],
 	        title: {
 							margin: 10,
 							<% if (@range == 'year' || @range == 'quarter') %>
@@ -93,7 +93,7 @@
 		         x: -20 //center
 		      },
 		      xAxis: {
-						categories: [<%= @axis %>],
+          categories: [<%= @axis.try(:html_safe) %>],
 		        title: {
 								margin: 10,
 								<% if (@range == 'year' || @range == 'quarter') %>
@@ -167,7 +167,7 @@
 			      },
 						plotOptions: { series: { enableMouseTracking: false, shadow: false, animation: false } },
 			      xAxis: {
-							categories: [<%= @axis %>],
+            categories: [<%= @axis.try(:html_safe) %>],
 			        title: {
 									margin: 10,
 									<% if (@range == 'year' || @range == 'quarter') %>
diff --git a/lib/snorby/report.rb b/lib/snorby/report.rb
index 9b0d2d2..772a7ae 100644
--- a/lib/snorby/report.rb
+++ b/lib/snorby/report.rb
@@ -24,7 +24,11 @@ module Snorby
 
       @event_count = @cache.all.map(&:event_count).sum
 
-      @axis = @sensor_metrics.last[:range].join(',') if @sensor_metrics.last
+      @axis = if @sensor_metrics.last
+        @sensor_metrics.last[:range].join(',')
+      else
+        ""
+      end
 
       @classifications = Classification.all(:order => [:events_count.desc])
       @sensors = Sensor.all(:limit => 5, :order => [:events_count.desc])
diff --git a/public/assets/snorby.css.gz b/public/assets/snorby.css.gz
index a7ed0a2..ce71a10 100644
Binary files a/public/assets/snorby.css.gz and b/public/assets/snorby.css.gz differ
diff --git a/public/assets/snorby.js.gz b/public/assets/snorby.js.gz
index f554a41..2df9d8e 100644
Binary files a/public/assets/snorby.js.gz and b/public/assets/snorby.js.gz differ