refinerycms-inquiries 0.9.8 → 0.9.8.1

data/app/controllers/admin/inquiry_settings_controller.rb

@@ -1,12 +1,19 @@
 class Admin::InquirySettingsController < Admin::BaseController
 
-  crudify :inquiry_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]
   after_filter :save_subject_for_confirmation?, :only => [:create, :update]
+  around_filter :rewrite_flash?, :only => [:create, :update]
 
 protected
+  def rewrite_flash?
+    yield
+
+    flash[:notice] = flash[:notice].to_s.gsub(/(\'.*\')/) {|m| m.titleize}.gsub('Inquiry ', '')
+  end
+
   def save_subject_for_confirmation?
     InquirySetting.confirmation_subject = params[:subject] if params.keys.include?('subject')
   end
@@ -16,7 +23,15 @@ protected
   end
 
   def set_url_override?
-    @url_override = admin_inquiry_setting_url(@inquiry_setting, :dialog => from_dialog?)
+    @url_override = admin_inquiry_setting_url(@refinery_setting.name.to_sym, :dialog => from_dialog?)
+  end
+
+  def find_refinery_setting
+    # prime the setting first, if it's valid.
+    if InquirySetting.methods.include?(params[:id].to_s.gsub('inquiry_', ''))
+      InquirySetting.send(params[:id].to_s.gsub('inquiry_', '').to_sym)
+    end
+    @refinery_setting = RefinerySetting.find_by_name(params[:id])
   end
 
 end

data/app/views/admin/inquiries/_submenu.html.erb

@@ -15,12 +15,12 @@
     </li>
     <li>
       <%= link_to t('.update_notified'),
-                    edit_admin_inquiry_setting_url(InquirySetting.notification_recipients, :dialog => true, :height => 300),
+                    edit_admin_inquiry_setting_url(:inquiry_notification_recipients, :dialog => true, :height => 300),
                     :class => "user_comment_icon" %>
     </li>
     <li>
       <%= link_to t('.edit_confirmation_email'),
-                  edit_admin_inquiry_setting_url(InquirySetting.confirmation_body, :dialog => true),
+                  edit_admin_inquiry_setting_url(:inquiry_confirmation_body, :dialog => true),
                   :class => "edit_email_icon" %>
     </li>
   </ul>

data/app/views/admin/inquiry_settings/_confirmation_email_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([:admin, @inquiry_setting], :url => (@url_override || @url)) do |f| %>
+<%= form_for([:admin, @refinery_setting], :url => (@url_override || @url)) do |f| %>
 
   <p>
     <%= t('.explanation') %>
@@ -28,7 +28,7 @@
         <label class='stripped'><%= t('.subject') %></label>
       </td>
       <td>
-        <%= text_field_tag 'subject', InquirySetting.confirmation_subject.value,
+        <%= text_field_tag 'subject', InquirySetting.confirmation_subject,
                            :class => 'widest' %>
       </td>
     </tr>

data/app/views/admin/inquiry_settings/_notification_recipients_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([:admin, @inquiry_setting], :url => (@url_override || @url)) do |f| %>
+<%= form_for([:admin, @refinery_setting], :url => (@url_override || @url)) do |f| %>
 
   <div class='field'>
     <span class='label_with_help'>

data/app/views/admin/inquiry_settings/edit.html.erb

@@ -1,4 +1,4 @@
-<% if @inquiry_setting.name == "Notification Recipients" %>
+<% if @refinery_setting.name.to_s.titleize == "Inquiry Notification Recipients" %>
   <%= render :partial => "notification_recipients_form", :locals => {:edit => true} -%>
 <% else %>
   <%= render :partial => "confirmation_email_form", :locals => {:edit => true} -%>

data/lib/inquiries.rb

@@ -1,11 +1,14 @@
 require 'refinery'
+require 'filters_spam'
 
 module Refinery
   module Inquiries
     class Engine < Rails::Engine
-      config.after_initialize do
+      config.to_prepare do
         require 'filters_spam'
-        
+      end
+
+      config.after_initialize do
         Refinery::Plugin.register do |plugin|
           plugin.title = "Inquiries"
           plugin.name = "refinery_inquiries"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-inquiries
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  version: 0.9.8
+  - 1
+  version: 0.9.8.1
 platform: ruby
 authors: 
 - Resolve Digital