panda_pal 5.3.10 → 5.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42e9ffbf3704935100156e28b5d3f2490fba75a5974b352f0092c14bb8b87ffb
-  data.tar.gz: 5d511a85fe356dfe659ecaacfc7023315f649947ff483c6969e253802549e825
+  metadata.gz: 13d3460a12f31ce93e9fba60f806871ba8e5507b43c8b761b06e34244b528215
+  data.tar.gz: c8a288d52fa8927835c8cf59561d9ff15a156631c09d9e556d561da0e55073f3
 SHA512:
-  metadata.gz: a4d2a7242e203c4c86866ff7efb3ba211c2b3b7f41463b776785371e06997470fdee569ed4e4ba0025a7eef6198bb067e1fdf71fc8b7c9307bf26c1d343de7db
-  data.tar.gz: 7c3f0facf0767b7afea02ad0368bf6a0d79c8522109289e463a95719cd7f3762a34b5ad641499ff96871815f2db1ec76f192dd6221936d3af2586399a402bf1f
+  metadata.gz: 440a454305b5d1b1ed3c6b34e7ea2c9875be68eaf0bced9e59eef8734cb5590a8643e385d2e00cf11450397ec4e7aa10df08f9e0e57a8fff22fdb352354437a8
+  data.tar.gz: 5b89736e51f2cbe46fe6d2ebc088b95ddb24f30e7f2aef4f3b90356f8a13de4b8b728695cdfee9f393a4ff539461462a1944e2592db66038b9be5e86a7b9698f

data/app/models/panda_pal/organization.rb

@@ -56,4 +56,6 @@ module PandaPal
       Apartment::Tenant.drop name
     end
   end
+
+  Organization.sync_schedules if Organization.respond_to?(:sync_schedules)
 end

data/app/models/panda_pal/organization_concerns/task_scheduling.rb

@@ -168,13 +168,17 @@ module PandaPal
         return nil unless cron_time.present?
 
         cron_time = instance_exec(&cron_time) if cron_time.is_a?(Proc)
-        if !Rufus::Scheduler.parse(cron_time).zone.present? && settings && settings[:timezone]
-          cron_time += " #{settings[:timezone]}"
+        if !Rufus::Scheduler.parse(cron_time).zone.present? && settings && settings_timezone
+          cron_time += " #{settings_timezone}"
         end
 
         cron_time
       end
 
+      def settings_timezone
+        settings[:timezone] || settings.dig(:canvas, :root_account_timezone).presence || nil
+      end
+
       class ScheduledTaskExecutor
         include Sidekiq::Worker
 

data/config/initializers/apartment.rb

@@ -10,10 +10,10 @@ Apartment.configure do |config|
 end
 
 Rails.application.config.middleware.use Apartment::Elevators::Generic, lambda { |request|
-  if request.path.starts_with?('/rails/active_storage/blobs/')
-    PandaPal::Organization.find_by(id: request.params['organization_id']).try(:name)
-  elsif match = request.path.match(/\/(?:orgs?|organizations?)\/(\d+)/)
+  if match = request.path.match(/\/(?:orgs?|organizations?)\/(\d+)/)
     PandaPal::Organization.find_by(id: match[1]).try(:name)
+  elsif request.path.starts_with?('/rails/active_storage/blobs/')
+    PandaPal::Organization.find_by(id: request.params['organization_id']).try(:name)
   end
 }
 

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.3.10"
+  VERSION = "5.3.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.3.10
+  version: 5.3.11
 platform: ruby
 authors:
 - Instructure ProServe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails