Combine location into one field

mlandauer · Sep 3, 2020 · f8442ba · f8442ba
1 parent 65063c2
commit f8442ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/app/views/deliveries/_click_events.html.haml b/app/views/deliveries/_click_events.html.haml
@@ -6,9 +6,7 @@
       %th Client
       %th OS
       %th IP
-      %th Country
-      %th Region
-      %th City
+      %th Location
       %th
         %abbr{title: "Internet Service Provider"} ISP
       %th Org
@@ -28,8 +26,6 @@
           - if event.os.version
             %span.muted (#{event.os.version})
         %td= event.ip.address
-        %td= event.ip.info.country
-        %td= event.ip.info.region_name
-        %td= event.ip.info.city
+        %td= "#{event.ip.info.city}, #{event.ip.info.region_name}, #{event.ip.info.country}"
         %td= event.ip.info.isp
         %td= event.ip.info.org
diff --git a/app/views/deliveries/_open_events.html.haml b/app/views/deliveries/_open_events.html.haml
@@ -5,9 +5,7 @@
       %th Client
       %th OS
       %th IP
-      %th Country
-      %th Region
-      %th City
+      %th Location
       %th
         %abbr{title: "Internet Service Provider"} ISP
       %th Org
@@ -26,8 +24,6 @@
           - if event.os.version
             %span.muted (#{event.os.version})
         %td= event.ip.address
-        %td= event.ip.info.country
-        %td= event.ip.info.region_name
-        %td= event.ip.info.city
+        %td= "#{event.ip.info.city}, #{event.ip.info.region_name}, #{event.ip.info.country}"
         %td= event.ip.info.isp
         %td= event.ip.info.org