diff --git a/lib/patchfile/engine.rb b/lib/patchfile/engine.rb index afda71d..a3ea3a7 100644 --- a/lib/patchfile/engine.rb +++ b/lib/patchfile/engine.rb @@ -2,29 +2,31 @@ require "yaml" module Patchfile class Engine < ::Rails::Engine initializer "patchfile" do - OrbitApp.registration "Patchfile", :type => "ModuleApp" do - base_url File.expand_path File.dirname(__FILE__) - # taggable "patchfilefield" - # categorizable - # authorizable - side_bar do - # head_label_i18n 'patchfile.patchfile', icon_class: "icons-megaphone" - # available_for "users" - # active_for_controllers (['admin/patchfiles']) - # head_link_path "admin_patchfiles_path" + Rails.application.config.to_prepare do + OrbitApp.registration "Patchfile", :type => "ModuleApp" do + base_url File.expand_path File.dirname(__FILE__) + # taggable "patchfilefield" + # categorizable + # authorizable + side_bar do + # head_label_i18n 'patchfile.patchfile', icon_class: "icons-megaphone" + # available_for "users" + # active_for_controllers (['admin/patchfiles']) + # head_link_path "admin_patchfiles_path" - # context_link 'patchfile.patchfile', - # :link_path=>"admin_patchfiles_path" , - # :priority=>1, - # :active_for_action=>{'admin/patchfiles'=>'index'}, - # :available_for => 'users' - # context_link 'CKEDITOR', - # :link_path=>"admin_patchfiles_showckeditor_path" , - # #:link_to=>"admin_patchfiles_path"+"/showckeditor" , - # :priority=>2, - # :active_for_action=>{'admin/patchfiles'=>'showckeditor'}, - # :available_for => 'users' + # context_link 'patchfile.patchfile', + # :link_path=>"admin_patchfiles_path" , + # :priority=>1, + # :active_for_action=>{'admin/patchfiles'=>'index'}, + # :available_for => 'users' + # context_link 'CKEDITOR', + # :link_path=>"admin_patchfiles_showckeditor_path" , + # #:link_to=>"admin_patchfiles_path"+"/showckeditor" , + # :priority=>2, + # :active_for_action=>{'admin/patchfiles'=>'showckeditor'}, + # :available_for => 'users' + end end end end diff --git a/updatefiles/application_helper.rb b/updatefiles/application_helper.rb index 4318966..8559c51 100644 --- a/updatefiles/application_helper.rb +++ b/updatefiles/application_helper.rb @@ -710,9 +710,9 @@ module ApplicationHelper filename = overridehtml.nil? ? File.basename(params[:layout_type]) : overridehtml module_name = File.basename(params[:target_controller]).singularize f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', module_name, "#{filename}.html.erb") - if !File.exists?f + if !File.exist?(f) f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', module_name, "index.html.erb") - if !File.exists?f + if !File.exist?(f) return "
Maybe the administrator has changed the theme, please select the index page design again from the page settings.
".html_safe end end @@ -771,7 +771,7 @@ module ApplicationHelper filename = overridehtml.nil? ? File.basename(params[:target_action]) : overridehtml module_name = File.basename(params[:target_controller]).singularize f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', module_name, "#{filename}.html.erb") - if File.exists?f + if File.exist?(f) file = File.open(f) doc = Nokogiri::HTML(file, nil, "UTF-8") file.close @@ -977,7 +977,7 @@ module ApplicationHelper def create_pagination(total_pages) file = File.join(Rails.root, 'app', 'templates', "#{@key}", 'home', "pagination.html.erb") html = "" - if File.exists?file + if File.exist?(file) file = File.open(file) doc = Nokogiri::HTML(file, nil, "UTF-8") file.close @@ -1056,7 +1056,7 @@ module ApplicationHelper url_dir_name = URI.decode(url_dir_name) url_dir_name = (url_dir_name == "/" ? "home" : url_dir_name.sub("/","").gsub("/","_").gsub("-","_").gsub(" ","_")) directory_name = "tmp/debug/#{url_dir_name}" - FileUtils.mkdir_p(directory_name) unless File.exists?(directory_name) + FileUtils.mkdir_p(directory_name) unless File.exist?(directory_name) fn = "#{directory_name}/#{controller_name}_#{action_name}.html" error_trace_spans = "" e.backtrace.each do |bt|