Permalink
Browse files

Merge branch 'development'

  • Loading branch information...
mjy committed Sep 12, 2018
2 parents 35fc1ea + 7c1766e commit c7eb7238522692b06ffceffdd0b12579e760b92c
Showing with 1 addition and 2 deletions.
  1. +1 −2 app/models/sqed_depiction.rb
@@ -39,7 +39,6 @@ class SqedDepiction < ApplicationRecord
include Shared::Notes
belongs_to :depiction
has_one :image, through: :depiction
validates_presence_of :depiction
@@ -87,7 +86,7 @@ def next_collection_object
# the (named) sections in this depiction that may have collecting event label metadata
def collecting_event_sections
# !! master merge
[:collecting_event_labels, :annotated_specimen] & extraction_metadata[:target_metadata_map].values
[:collecting_event_labels, :annotated_specimen] & extraction_metadata[:metadata_map].values
end
def nearby_sqed_depictions(before = 5, after = 5)

0 comments on commit c7eb723

Please sign in to comment.