refinerycms-inquiries 0.9.8.2 → 0.9.8.3

data/app/controllers/admin/inquiry_settings_controller.rb

@@ -1,9 +1,12 @@
 class Admin::InquirySettingsController < Admin::BaseController
 
-  crudify :refinery_setting, :title_attribute => "name", :order => 'name ASC', :redirect_to_url => "admin_inquiries_url"
+  crudify :refinery_setting,
+          :title_attribute => "name",
+          :order => 'name ASC',
+          :redirect_to_url => "admin_inquiries_url"
 
   before_filter :redirect_back_to_inquiries?, :only => [:index]
-  before_filter :set_url_override?, :only => [:edit]
+  before_filter :set_url_override?, :only => [:edit, :update]
   after_filter :save_subject_for_confirmation?, :only => [:create, :update]
   around_filter :rewrite_flash?, :only => [:create, :update]
 
@@ -23,12 +26,20 @@ protected
   end
 
   def set_url_override?
-    @url_override = admin_inquiry_setting_url(@refinery_setting.name.to_sym, :dialog => from_dialog?)
+    @url_override = admin_inquiry_setting_url(@refinery_setting, :dialog => from_dialog?)
   end
 
   def find_refinery_setting
+    # ensure that we're dealing with the name of the setting, not the id.
+    begin
+      if params[:id].to_i.to_s == params[:id]
+        params[:id] = RefinerySetting.find(params[:id]).name.to_s
+      end
+    rescue
+    end
+
     # prime the setting first, if it's valid.
-    if InquirySetting.methods.include?(params[:id].to_s.gsub('inquiry_', ''))
+    if InquirySetting.methods.map(&:to_sym).include?(params[:id].to_s.gsub('inquiry_', '').to_sym)
       InquirySetting.send(params[:id].to_s.gsub('inquiry_', '').to_sym)
     end
     @refinery_setting = RefinerySetting.find_by_name(params[:id])

data/app/models/inquiry_setting.rb

@@ -7,7 +7,8 @@ class InquirySetting < ActiveRecord::Base
   end
 
   def self.confirmation_subject
-    RefinerySetting.find_or_set(:inquiry_confirmation_subject, "Thank you for your inquiry")
+    RefinerySetting.find_or_set(:inquiry_confirmation_subject,
+                                "Thank you for your inquiry")
   end
 
   def self.confirmation_subject=(value)
@@ -15,11 +16,13 @@ class InquirySetting < ActiveRecord::Base
   end
 
   def self.notification_recipients
-    RefinerySetting.find_or_set(:inquiry_notification_recipients, (Role[:refinery].users.first.email if defined?(Role)))
+    RefinerySetting.find_or_set(:inquiry_notification_recipients,
+                                (defined?(Role) ? Role[:refinery].users.first.email : '' rescue ''))
   end
 
   def self.notification_subject
-    RefinerySetting.find_or_set(:inquiry_notification_subject, "New inquiry from your website")
+    RefinerySetting.find_or_set(:inquiry_notification_subject,
+                                "New inquiry from your website")
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-inquiries
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - 2
-  version: 0.9.8.2
+  - 3
+  version: 0.9.8.3
 platform: ruby
 authors: 
 - Resolve Digital