From bbd30759f5ef0ac7ea87179ad74dfd8da29b49de Mon Sep 17 00:00:00 2001 From: Fu Matthew Date: Tue, 29 Jan 2013 10:05:50 +0800 Subject: [PATCH] fix web resource frontend page --- lib/parsers/parser_front_end.rb | 2 +- lib/tasks/migrate.rake | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 49dccef0..c4f644b0 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -102,7 +102,7 @@ module ParserFrontEnd if page.app_frontend_url == 'default_widget' url = "/panel/orbit_app/widget/#{page.frontend_style}?inner=true" else - "/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}\#{(\"/\" + params[:id]) if params[:id] && !params[:id].eql?(page.id.to_s)}\#{(\"/\" + params[:controller_action]) if params[:controller_action] && params[:id]}?inner=true" + url = "/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}\#{(\"/\" + params[:id]) if params[:id] && !params[:id].eql?(page.id.to_s)}\#{(\"/\" + params[:controller_action]) if params[:controller_action] && params[:id]}?inner=true" end diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index cf8ec258..0d8b08d0 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -351,7 +351,8 @@ namespace :migrate do end - task :make_default_widget_work_config => :environment do + + task :make_default_widget_work_config_for_announcement => :environment do a = ModuleApp.where(:key=>'announcement').first a.widgets[:default_widget] = ['typeA','typeC','typeB_style2','typeB_style3','typeB_style4'] a.widgets = {"index"=>["1", "2"], "default_widget"=>["typeA", "typeC", "typeB_style2", "typeB_style3", "typeB_style4"]} @@ -371,6 +372,24 @@ namespace :migrate do a.save end + task :make_default_widget_work_config_for_web_link => :environment do + a = ModuleApp.where(:key=>'web_resource').first + a.widgets = { "default_widget"=>["typeA", "typeC", "typeB_style2", "typeB_style3", "typeB_style4"]} + a.widget_fields = [ + ["title","web_link.default_widget.title"], + ["web_link_with_title","web_link.default_widget.bulletin_category_with_title"] + ] + a.get_default_widget = {:query=>'WebLink.all'} + a.widget_fields_link_method = { + "title"=>{:method => 'panel_web_resource_front_end_web_link_path', + :args=>:self}, + "web_link_with_title"=>{ + :method => 'panel_web_resource_front_end_web_link_path', + :args=>{:category_id => [:web_link_category,:id]}} + } + a.save + end + task :reorder_items => :environment do reorder_children(Item.root)