Merge pull request #140 from southbridgeio/feature/removed-unloadable…

…-fixed-mailer Removed unloadable and fixed missed Mailer method error
southbridgeio · Jan 8, 2025 · a00a382 · a00a382
2 parents 3d74bc6 + e6460a2
commit a00a382
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 13 deletions.
diff --git a/app/controllers/intouch_controller.rb b/app/controllers/intouch_controller.rb
@@ -1,5 +1,4 @@
 class IntouchController < ApplicationController
-  unloadable
 
   before_action :find_project, only: [:save_settings]
 

diff --git a/app/controllers/intouch_cron_jobs_controller.rb b/app/controllers/intouch_cron_jobs_controller.rb
@@ -1,5 +1,4 @@
 class IntouchCronJobsController < ApplicationController
-  unloadable
 
   layout 'admin'
 

diff --git a/app/controllers/settings_templates_controller.rb b/app/controllers/settings_templates_controller.rb
@@ -1,5 +1,4 @@
 class SettingsTemplatesController < ApplicationController
-  unloadable
 
   layout 'admin'
 

diff --git a/app/models/intouch_mailer.rb b/app/models/intouch_mailer.rb
@@ -9,7 +9,7 @@ class IntouchMailer < ActionMailer::Base
   default from: Setting.mail_from
 
   def self.default_url_options
-    Mailer.default_url_options
+    ::Mailer.default_url_options
   end
 
   def reminder_email(user, issue)

diff --git a/app/models/settings_template.rb b/app/models/settings_template.rb
@@ -1,5 +1,4 @@
 class SettingsTemplate < ActiveRecord::Base
-  unloadable
 
   store :intouch_settings, accessors: %w[assigner_groups assigner_roles reminder_settings] | Intouch.protocols.keys.map { |p| "#{p}_settings" }
 

diff --git a/app/models/telegram_user.rb b/app/models/telegram_user.rb
@@ -1,5 +1,4 @@
 class TelegramUser < ActiveRecord::Base
-  unloadable
 
   belongs_to :user
 

diff --git a/db/migrate/012_create_intouch_telegram_chat_subscriptions.rb b/db/migrate/012_create_intouch_telegram_chat_subscriptions.rb
@@ -2,7 +2,7 @@ class CreateIntouchTelegramChatSubscriptions < Rails.version < '5.0' ? ActiveRec
   def change
     create_table :intouch_telegram_chat_subscriptions do |t|
       t.integer :chat_id, null: false
-      t.belongs_to :issue, foreign_key: true, null: false
+      t.belongs_to :issue, type: :integer, foreign_key: true, null: false
     end
   end
 end
diff --git a/lib/intouch/patches/issue_patch.rb b/lib/intouch/patches/issue_patch.rb
@@ -5,7 +5,6 @@ module IssuePatch
 
       def self.included(base) # :nodoc:
         base.class_eval do
-          unloadable
 
           # noinspection RubyArgCount
           store :intouch_data, accessors: %w(last_notification)

diff --git a/lib/intouch/patches/issue_priority_patch.rb b/lib/intouch/patches/issue_priority_patch.rb
@@ -3,7 +3,6 @@ module Patches
     module IssuePriorityPatch
       def self.included(base) # :nodoc:
         base.class_eval do
-          unloadable
 
           def self.alarm_ids
             settings = Setting.plugin_redmine_intouch

diff --git a/lib/intouch/patches/issue_status_patch.rb b/lib/intouch/patches/issue_status_patch.rb
@@ -3,7 +3,6 @@ module Patches
     module IssueStatusPatch
       def self.included(base) # :nodoc:
         base.class_eval do
-          unloadable
 
           def self.feedback_ids
             settings = Setting.plugin_redmine_intouch

diff --git a/lib/intouch/patches/journal_patch.rb b/lib/intouch/patches/journal_patch.rb
@@ -3,7 +3,6 @@ module Patches
     module JournalPatch
       def self.included(base) # :nodoc:
         base.class_eval do
-          unloadable
 
           after_commit :handle_updated_issue, on: :create
 

diff --git a/lib/intouch/patches/project_patch.rb b/lib/intouch/patches/project_patch.rb
@@ -3,7 +3,6 @@ module Patches
     module ProjectPatch
       def self.included(base) # :nodoc:
         base.class_eval do
-          unloadable
 
           # noinspection RubyArgCount
           store :intouch_settings, accessors: %w[settings_template_id assigner_groups assigner_roles reminder_settings] | Intouch.protocols.keys.map { |p| "#{p}_settings" }

diff --git a/lib/intouch/patches/projects_helper_patch.rb b/lib/intouch/patches/projects_helper_patch.rb
@@ -7,7 +7,6 @@ def self.included(base)
         base.send(:include, MethodsPatch)
 
         base.module_eval do
-          unloadable
 
           alias_method :project_settings_tabs_without_intouch, :project_settings_tabs
           alias_method :project_settings_tabs, :project_settings_tabs_with_intouch