Only set pending users to active on a password reset

[rails.git] / app / models / tracepoint.rb

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index 8648e555d2ec4c62fd9332fc6fd3bfbb6e9530e2..d4ba39de39368419f2a2434c0ba5acfb2d8a6493 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,4 +1,6 @@
-class Tracepoint < GeoRecord
+class Tracepoint < ActiveRecord::Base
+  include GeoRecord
+

   set_table_name 'gps_points'
 
   validates_numericality_of :trackid, :only_integer => true
   set_table_name 'gps_points'
 
   validates_numericality_of :trackid, :only_integer => true


@@ -9,10 +11,11 @@ class Tracepoint < GeoRecord
 
   belongs_to :trace, :foreign_key => 'gpx_id'
 
 
   belongs_to :trace, :foreign_key => 'gpx_id'
 

-  def to_xml_node
+  def to_xml_node(print_timestamp = false)

     el1 = XML::Node.new 'trkpt'
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
     el1 = XML::Node.new 'trkpt'
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s

+    el1 << (XML::Node.new("time") << self.timestamp.xmlschema) if print_timestamp

     return el1
   end
 end
     return el1
   end
 end