From 863d7084d0d938b68da78e1370698d3a360bd9fc Mon Sep 17 00:00:00 2001 From: Agnieszka Figiel Date: Tue, 31 Mar 2015 09:16:45 +0200 Subject: [PATCH 1/3] fixed require in Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3007ca0882..4189171928 100644 --- 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' From 65af2c55999a07a59d7cc4a1708de9bcbfb13679 Mon Sep 17 00:00:00 2001 From: Agnieszka Figiel Date: Tue, 31 Mar 2015 09:17:13 +0200 Subject: [PATCH 2/3] added specific EuRegulations back into the EuOpinions event dropdown --- app/controllers/admin/eu_opinions_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/eu_opinions_controller.rb b/app/controllers/admin/eu_opinions_controller.rb index cc54b57b54..a213b3737a 100644 --- 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 From 14afa057ff8bf49139dee4c45fd6aec70a84e275 Mon Sep 17 00:00:00 2001 From: Agnieszka Figiel Date: Tue, 31 Mar 2015 09:40:33 +0200 Subject: [PATCH 3/3] fixed display of quotas in preparation --- app/serializers/species/quota_serializer.rb | 3 +++ app/serializers/species/show_taxon_concept_serializer_cites.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/serializers/species/quota_serializer.rb b/app/serializers/species/quota_serializer.rb index 9ce6dd875a..c0e9459af4 100644 --- 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 index 0b90560925..09191dd79e 100644 --- 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,