lib/models/trip_leg.rb in fossil-0.4.22 vs lib/models/trip_leg.rb in fossil-0.4.23

@@ -43,19 +43,17 @@
       end
     }
 
   many_to_one :departure_airport, :class=>:Airport, :key=>nil, :dataset=>
     proc {
-      if !arrival_icao.blank?
-        Airport.filter(:'icao'=> arrival_icao)
-      elsif !arrival_airport_id.blank? and !arrival_ap_prefix.blank?
-        Airport.filter(:'airport id prefix'.like("%#{arrival_ap_prefix}"), :'airport id'.like("%#{arrival_airport_id}"))
+      if !departure_icao.blank?
+        Airport.filter(:'icao'=> departure_icao)
+      elsif !depart_airport_id.blank? and !depart_ap_prefix.blank?
+        Airport.filter(:'airport id prefix'.like("%#{depart_ap_prefix}"), :'airport id'.like("%#{depart_airport_id}"))
       else
         Airport.filter(:'icao'=>'FAKE').limit(1)
       end
     }
-
-  many_to_one :departure_airport, :class=>:Airport, :key=>:departure_icao, :primary_key=>:icao #:key=>nil, :dataset=>proc{ ref_method = self[:'depart-icao/iata/id']; case ref_method; when 1 then Airport.filter(:'icao'=>self[:'departure icao']); when 2 then Airport.filter(:'iata'=>self[:'departure iata']); else Airport.filter(:'airport id prefix'.like("%#{self[:'depart a/p prefix']}"), :'airport id'.like("%#{self[:'depart airport id']}")); end }
 
   many_to_one :departure_fuel_vendor, :class=>:Vendor, :key=>:dep_fuel_vendor, :primary_key=>:'vendor id'
   many_to_one :arrival_fuel_vendor, :class=>:Vendor, :key=>:arr_fuel_vendor, :primary_key=>:'vendor id'
 
   many_to_one :alternate_arrival_airport, :class=>:Airport, :key=>nil, :dataset=>proc{ Airport.filter(:'airport id prefix'.like("%#{self[:'arr alt prefix']}"), :'airport id'.like( "%#{self[:'arr alt id']}"))}
\ No newline at end of file