lib/enju_leaf.rb in enju_leaf-1.1.0.rc17 vs lib/enju_leaf.rb in enju_leaf-1.1.0.rc18

@@ -2,11 +2,10 @@
 require "enju_leaf/version"
 require "enju_leaf/controller"
 require "enju_leaf/user"
 require "enju_leaf/helper"
 require "enju_leaf/calculate_stat"
-require "enju_leaf/calculate_stat"
 require "enju_leaf/import_file"
 require "enju_leaf/export_file"
 require "enju_leaf/localized_name"
 require "enju_leaf/master_model"
 require "enju_leaf/url_validator"
@@ -70,12 +69,12 @@
     def render_500
       Rails.logger.fatal("please confirm that the Solr is running.")
       return if performed?
       #flash[:notice] = t('page.connection_failed')
       respond_to do |format|
-        format.html {render file: "#{Rails.root.to_s}/public/500", layout: false, status: 500}
-        format.mobile {render file: "#{Rails.root.to_s}/public/500", layout: false, status: 500}
+        format.html {render file: "#{Rails.root}/public/500", layout: false, status: 500}
+        format.mobile {render file: "#{Rails.root}/public/500", layout: false, status: 500}
         format.xml {render template: 'page/500', status: 500}
         format.json { render text: '{"error": "server_error"}' }
         format.xml {render template: 'page/500.xml', status: 500}
       end
     end
@@ -136,11 +135,11 @@
     end
 
     def convert_charset
       case params[:format]
       when 'csv'
-        return unless Setting.csv_charset_conversion
+        return unless LibraryGroup.site_config.settings[:csv_charset_conversion]
         # TODO: 他の言語
         if @locale.to_sym == :ja
           headers["Content-Type"] = "text/csv; charset=Shift_JIS"
           response.body = NKF::nkf('-Ws', response.body)
         end
@@ -212,11 +211,11 @@
       @current_ability
     end
 
     def get_top_page_content
       if defined?(EnjuNews)
-        @news_feeds = Rails.cache.fetch('news_feed_all'){NewsFeed.all}
-        @news_posts = NewsPost.limit(Setting.news_post.number.top_page)
+        @news_feeds = Rails.cache.fetch('news_feed_all'){NewsFeed.order(:position)}
+        @news_posts = NewsPost.limit(LibraryGroup.site_config.settings[:news_post_number_top_page] || 10)
       end
       @libraries = Library.real
     end
 
     def set_mobile_request