question.rb in enjoy_cms_faq-0.4.0.beta3

- old
+ new

@@ -3,20 +3,25 @@
     module Question
       extend ActiveSupport::Concern
       include Enjoy::Model
       include Enjoy::Enableable
 
-      include Enjoy::Seoable
-      include Enjoy::SitemapDataField
+      if Enjoy::Faq.config.seo_support
+        include Enjoy::Seo::Seoable
+        include Enjoy::Seo::SitemapDataField
+      end
       include ManualSlug
 
       include Enjoy::Faq.orm_specific('Question')
 
       included do
         manual_slug :full_name
 
-        apply_simple_captcha message: Enjoy::Faq.configuration.captcha_error_message
+        if Enjoy::Faq.config.simple_captcha_support
+          include SimpleCaptcha::ModelHelpers
+          apply_simple_captcha message: Enjoy::Faq.configuration.captcha_error_message
+        end
 
         validates_email_format_of :author_email
         if Enjoy::Faq.config.author_name_required
           validates_presence_of :author_name
         end
@@ -29,11 +34,11 @@
 
       def full_name
         "#{self.author_name_output}: \"#{self.question_text_output}\""
       end
 
-      def question_category_class
-        Enjoy::Faq::QuestionCategory
+      def category_class
+        Enjoy::Faq::Category
       end
 
     end
   end
 end