Skip to content

Commit

Permalink
Merge pull request #520 from Harry-R/competition-id-delete
Browse files Browse the repository at this point in the history
Use only flight's values for details table
  • Loading branch information
Turbo87 authored Oct 27, 2016
2 parents edf829e + 9783cdb commit 7660d2c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ember/app/components/flight-details-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export default Ember.Component.extend({
duration: safeComputed('flight.takeoffTime', 'flight.landingTime',
(takeoff, landing) => (new Date(landing).getTime() - new Date(takeoff).getTime()) / 1000),

registration: Ember.computed.or('flight.registration', 'flight.igcFile.registration'),
competitionId: Ember.computed.or('flight.competitionId', 'flight.igcFile.competitionId'),
registration: Ember.computed.alias('flight.registration'),
competitionId: Ember.computed.alias('flight.competitionId'),

isPilot: safeComputed('flight.pilot.id', 'flight.copilot.id', 'account.user.id',
(pilotId, copilotId, accountId) => pilotId === accountId || copilotId === accountId),
Expand Down

0 comments on commit 7660d2c

Please sign in to comment.