Merge branch 'hotfix-0.9.4.2'

unepwcmc · Mar 31, 2015 · b839318 · b839318
2 parents 0629ad6 + 14afa05
commit b839318
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -93,7 +93,7 @@ group :development do
   # Deploy with Capistrano
   gem 'capistrano'
   gem 'capistrano-ext'
-  gem 'rvm-capistrano'
+  gem  'rvm-capistrano', require: false
   gem 'capistrano-sidekiq'
   gem 'capistrano-slack', :git => 'https://github.com/nextupdate/capistrano-slack.git'
   gem 'brightbox', '>=2.3.9'

diff --git a/app/controllers/admin/eu_opinions_controller.rb b/app/controllers/admin/eu_opinions_controller.rb
@@ -40,7 +40,9 @@ def load_lib_objects
     @geo_entities = GeoEntity.order(:name_en).joins(:geo_entity_type).
       where(:geo_entity_types => {:name => GeoEntityType::SETS[GeoEntityType::DEFAULT_SET]})
     @eu_decision_types = EuDecisionType.opinions
-    @ec_srgs = EcSrg.order("effective_at DESC")
+    @ec_srgs = Event.where("type = 'EcSrg' OR
+      type = 'EuRegulation' AND name IN ('No 338/97', 'No 938/97', 'No 750/2013')"
+    ).order("effective_at DESC")
   end
 
   def collection

diff --git a/app/serializers/species/quota_serializer.rb b/app/serializers/species/quota_serializer.rb
@@ -11,4 +11,7 @@ def geo_entity
   def unit
     object['unit_en'] && JSON.parse(object['unit_en'])
   end
+  def quota
+    object['quota_for_display']
+  end
 end
diff --git a/app/serializers/species/show_taxon_concept_serializer_cites.rb b/app/serializers/species/show_taxon_concept_serializer_cites.rb
@@ -26,7 +26,7 @@ def quotas
               trade_restrictions.is_current,
               trade_restrictions.geo_entity_id,
               trade_restrictions.unit_id,
-              CASE WHEN quota IS NULL THEN 'in prep.' ELSE quota::TEXT END,
+              CASE WHEN quota IS NULL THEN 'in prep.' ELSE quota::TEXT END AS quota_for_display,
               trade_restrictions.public_display,
               trade_restrictions.nomenclature_note_en,
               trade_restrictions.nomenclature_note_fr,