From a8bc48eef4830a5acbce63c05014594a82c8317b Mon Sep 17 00:00:00 2001 From: Bohung Date: Wed, 13 Apr 2022 23:26:01 +0800 Subject: [PATCH] Fix bug. --- app/controllers/admin/announcements_controller.rb | 2 +- app/controllers/announcements_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb index e6cfcbc..1ecfffa 100644 --- a/app/controllers/admin/announcements_controller.rb +++ b/app/controllers/admin/announcements_controller.rb @@ -28,7 +28,7 @@ class Admin::AnnouncementsController < OrbitAdminController def update_sort_setting setting = @announcement_setting setting.update_attributes(settings_params) - if defined?(OrbitHelper::SharedHash) + if defined?(OrbitHelper::SharedHash) && OrbitHelper::SharedHash OrbitHelper::SharedHash['announcement'][:enable_manually_sort] = setting.enable_manually_sort end redirect_to edit_sort_admin_announcement_path diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb index 83d35a8..2c00b8f 100644 --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -9,7 +9,7 @@ class AnnouncementsController < ApplicationController end def manually_sort - if defined?(OrbitHelper::SharedHash) + if defined?(OrbitHelper::SharedHash) && OrbitHelper::SharedHash OrbitHelper::SharedHash['announcement'][:enable_manually_sort] rescue AnnouncementSetting.first.enable_manually_sort else AnnouncementSetting.first.enable_manually_sort rescue false