concerto_emergency 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c929e105126cf1ceb63a6d368faaf46a8167d131
-  data.tar.gz: 8fafed26dc350f88032e43b354b293183458602b
+  metadata.gz: ae5b167fe1838320f01a54deb219434671fd73a5
+  data.tar.gz: 05ca46587948ef1b4d354706a75998d057aada44
 SHA512:
-  metadata.gz: cdbd0cb8504c8222ee0e95624031994c3fdf10db58f6a6f5e90d4c102e470b347a851ff0f6cc2bd972a24ff61b988c8238800f521d9dd063505e7a848c3c297a
-  data.tar.gz: e43bcb2694ccde5550a5d8282f0e8d217a02129854ad1dbb83db92fcbe23453688f3b85e31663c7ce65e90aafd87d71a077e457fe923c164410a85fe7ffbd967
+  metadata.gz: e77365dc568c0e369e8e18f9d97f78180bc5a6cdc2f2897b73e1b3b19b9ba372b2442b1e6f5711d1db8b43d2d6e653bc14cce7d9a7c94e6ffacb610fb1a52748
+  data.tar.gz: c72bb0080e297eca9b7e99b41dd58000b3934b9bcb31fb90a6b415180e345effee7cf2585ab7fa61d544357993cfe40d7e95dce0fdbb7004ef287bdd28d35a9c

data/lib/concerto_emergency/engine.rb

@@ -27,10 +27,10 @@ module ConcertoEmergency
         add_controller_hook "Screen", :frontend_display, :before do
 
           emergency_feed = Feed.find_by_name(ConcertoConfig[:emergency_feed])
+          emergency_active = emergency_feed.submissions.approved.active.includes(:content).where("kind_id != 4").present?
 
           # Check for emergency content 
-          if not emergency_feed.nil? and not emergency_feed.submissions.approved.active.empty?
-            
+          if not emergency_feed.nil? and emergency_active
             # swap template to emergency template if emergency content is present
             emergency_template = Template.find_by_name(ConcertoConfig[:emergency_template])
             if not emergency_template.nil?
@@ -44,13 +44,14 @@ module ConcertoEmergency
         add_controller_hook "Frontend::ContentsController", :index, :after do
 
           emergency_feed = Feed.find_by_name(ConcertoConfig[:emergency_feed])
+          emergency_active = emergency_feed.submissions.approved.active.includes(:content).where("kind_id != 4").present?
           
           if not emergency_feed.nil?
-            emergency_submissions = emergency_feed.submissions.approved.active
+            emergency_submissions = emergency_feed.submissions.approved.active.includes(:content).where("kind_id = ?", @field.kind_id)
             emergency_contents = Array.new()
             emergency_submissions.each { |submission| emergency_contents << Content.find(submission.content_id) }
         
-            if not emergency_contents.empty?
+            if emergency_active
 
               # Change template identifier so the screen knows a template 
               #  is used for emergency alerts
@@ -62,6 +63,8 @@ module ConcertoEmergency
               # Content supplied to screen is replaced with emergency contents
               @content = emergency_contents
             end
+          else
+            Rails.logger.error("could not find emergency feed #{ConcertoConfig[:emergency_feed]}")
           end
         end
 

data/lib/concerto_emergency/version.rb

@@ -1,3 +1,3 @@
 module ConcertoEmergency
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_emergency
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Broadcast emergency alerts on Concerto screens.