effective_polls 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e014f4462a07752d6e06f332934f392c6b396c0f7f6279501f11036005d627fa
-  data.tar.gz: a108863da8039d6aa608d10aa043fef580b435c5c8dff564d382e69120338027
+  metadata.gz: '0866cfca4a02dfa03072115499d8170354a405a59dc5b3f7c41fa0cd47572488'
+  data.tar.gz: 1c281a7ef70e127dfa155011d1be9d5976bde1750b09ef7d30ae3ae72d549fbc
 SHA512:
-  metadata.gz: e790818639b367c3357f162ff66ee9f795242e337f01d79bab869d0fd63da2b6a9b7b82b097793149f8e1576460253945535161d5e982023e471fa7f3c47b431
-  data.tar.gz: 7197c7a2dcec5fb46a781e5979998ed9602e2dda492f9c885b1f8b3b0be28dc9796255b0e7a9f9a7ccf42b3a4ced34f6e61b81d32fc8fa8cb41699b4fe13d196
+  metadata.gz: 7d754ccfdbd61b07fbd358b2e32b71ba3d04eab8baffc35d7c8d95267f08cbbbc469812bda3661ddab70173fbe08825472185fe5ddbeeb4f88c300835ebc0839
+  data.tar.gz: c66bb05e2cc63164b889591e5239b58a094e803b64c406ceef6d10ff575d1a218d10751b66d20ff639891e8c242d5e1cb0ac3e457ae513b3d4172c27bd17b630

data/app/datatables/admin/effective_poll_questions_datatable.rb

@@ -13,7 +13,7 @@ class Admin::EffectivePollQuestionsDatatable < Effective::Datatable
     end
 
     col :title
-    col :body
+    col :body, as: :text
     col :required
 
     col :category, label: 'Type'

data/app/helpers/effective_polls_helper.rb

@@ -1,10 +1,5 @@
 module EffectivePollsHelper
 
-  # Used on dashboard
-  def polls_name_label
-    et('effective_polls.name')
-  end
-
   # Used by admin/polls form
   def effective_polls_audience_scope_collection(poll)
     klass = poll.try(:audience_class)

data/app/models/concerns/effective_polls_user.rb

@@ -21,6 +21,9 @@ module EffectivePollsUser
 
   # The list of all available audience scopes for the Poll Selected Users
   def poll_audience_scopes
+  end
+
+  def default_poll_audience_scopes
     scopes = [
       ['All Users', :all]
     ]
@@ -39,6 +42,12 @@ module EffectivePollsUser
       end
     end
 
+    if self.class.try(:acts_as_role_restricted?)
+      scopes += EffectiveRoles.roles.map do |role|
+        ["All #{role} role users", "with_role_id_#{role}"]
+      end
+    end
+
     scopes
   end
 
@@ -46,18 +55,21 @@ module EffectivePollsUser
   def poll_audience_scope(value)
     collection = self.class.respond_to?(:unarchived) ? self.class.unarchived : self.class
 
-    # If we respond to the fill value, call it
-    return collection.send(value) if collection.respond_to?(value)
-
     # Parse the value
     name, id = value.to_s.split('_id_')
 
     case name.try(:to_sym)
     when :members_with_category
-      collection.members_with_category(EffectiveMemberships.Category.find(id))
-    else
-      raise("unknown poll_audience_scope for #{value}")
+      return collection.members_with_category(EffectiveMemberships.Category.find(id))
+    when :with_role
+      return collection.with_role(id)
     end
+
+    # Otherwise we don't know what this scope is
+    raise("unknown poll_audience_scope for #{value}. Expected #{self.class.name} to have a scope named #{value}") unless collection.respond_to?(value) 
+
+    # If we respond to the fill value, call it
+    collection.send(value) 
   end
 
   def available_polls

data/app/views/admin/polls/_form_poll.html.haml

@@ -36,6 +36,6 @@
       .card-body
         %h5 Selected Users
         %p Users within any of the following groups may complete this #{etd(poll)} 
-        = f.checks :audience_scope, effective_polls_audience_scope_collection(f.object), multiple: true, label: false
+        = f.checks :audience_scope, effective_polls_audience_scope_collection(f.object), multiple: true
 
   = effective_submit(f)

data/app/views/effective/polls/_dashboard.html.haml

@@ -16,7 +16,7 @@
 
   %hr
 
-%h2 #{polls_name_label}
+%h2 #{et('effective_polls.name')}
 
 - if datatable.present?
   %p The following #{etsd(Effective::Poll)} are available:

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.5.0'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails