From 32b7d95669ee25e3a81c92c729f611e8888021c5 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Fri, 30 Mar 2012 15:51:29 +0800 Subject: [PATCH] Fix parser_back_end & side_bar & meta --- .../admin/{attributes => pages}/_app_selector.html.erb | 0 app/views/admin/pages/_form.html.erb | 2 +- app/views/layouts/_side_bar.html.erb | 2 +- config/application.rb | 1 + lib/parsers/parser_back_end.rb | 6 +++--- 5 files changed, 6 insertions(+), 5 deletions(-) rename app/views/admin/{attributes => pages}/_app_selector.html.erb (100%) diff --git a/app/views/admin/attributes/_app_selector.html.erb b/app/views/admin/pages/_app_selector.html.erb similarity index 100% rename from app/views/admin/attributes/_app_selector.html.erb rename to app/views/admin/pages/_app_selector.html.erb diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb index 9722413c..6c211d01 100644 --- a/app/views/admin/pages/_form.html.erb +++ b/app/views/admin/pages/_form.html.erb @@ -25,7 +25,7 @@

<%= t('admin.module_app') %> - <%= render :partial => "admin/module_apps/app_selector", :locals => { :f => f } %> + <%= render :partial => "app_selector", :locals => { :f => f } %> <%= select('page','app_frontend_url', @app_frontend_urls, :selected => @item.app_frontend_url ) rescue ''%> <%= select('page','category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => @item[:category] ) rescue ''%>

diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index baeef6c4..e2f757db 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -9,7 +9,7 @@ <%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %> <%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %> <%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %> - <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') if is_manager? %> + <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') if (is_manager? rescue nil) %> <% end -%> <% end -%> diff --git a/config/application.rb b/config/application.rb index 381d1c64..cef8c446 100644 --- a/config/application.rb +++ b/config/application.rb @@ -31,6 +31,7 @@ module Orbit config.autoload_paths += %W(#{config.root}/lib) config.autoload_paths += %W(#{config.root}/lib/parsers) config.autoload_paths += %W(#{config.root}/app/models/design) + config.autoload_paths += %W(#{config.root}/app/models/meta) config.autoload_paths += %W(#{config.root}/app/models/purchase) config.autoload_paths += %W(#{config.root}/app/models/user) diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb index 3e641118..12429247 100644 --- a/lib/parsers/parser_back_end.rb +++ b/lib/parsers/parser_back_end.rb @@ -26,7 +26,7 @@ module ParserBackEnd def parse_page_edit_noko(page, id = nil) body = Nokogiri::HTML(page.design.layout.body) parse_menu(body, page, true) - public_r_tags = parse_contents(body, page, id) + public_r_tags = parse_content_edits(body, page, id) parse_images(body, page) public_r_tags.each do |tag| @@ -37,7 +37,7 @@ module ParserBackEnd end # page_contents - def parse_contents(body, page, id) + def parse_content_edits(body, page, id) public_r_tags = [] body.css('.page_content').each do |content| ret = '' @@ -47,7 +47,7 @@ module ParserBackEnd ret << "'>" else part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil - ret << "
" + ret << "
" ret << "'