developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change get_item 

Add category and tags to default widget link to object
This commit is contained in:
chris 2013-07-19 18:39:13 +08:00
parent b37643147f
commit 71e8b3c042
7 changed files with 74 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
app/controllers/pages_controller.rb
View File

@ -45,28 +45,12 @@ class PagesController < ApplicationController
#end #end
end end
def convert_array_param(key,array)
array.collect{|t| "#{key}[]=#{t}"}.join("&")
end
def index_from_link def index_from_link
url = "/#{@item.path}" url = "/#{@item.path}"
options = '' options = ''
options << "#{options.blank? ? '?' : '&'}page_main=#{params[:page_main]}" unless params[:page_main].blank? options << "#{options.blank? ? '?' : '&'}page_main=#{params[:page_main]}" unless params[:page_main].blank?
options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id', params[:category_id])}" unless params[:category_id].blank?
if params[:category_id].is_a? Array options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id', params[:tag_id])}" unless params[:tag_id].blank?
options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id',params[:category_id])}" unless params[:category_id].blank?
elsif params[:category_id].is_a? String
options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
end
if params[:tag_id].is_a? Array
options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id',params[:tag_id])}" unless params[:tag_id].blank?
elsif params[:category_id].is_a? String
options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
end
options << "#{options.blank? ? '?' : '&'}search_query=#{params[:search_query]}" unless params[:search_query].blank? options << "#{options.blank? ? '?' : '&'}search_query=#{params[:search_query]}" unless params[:search_query].blank?
options << "#{options.blank? ? '?' : '&'}name=#{params[:name]}" unless params[:name].blank? options << "#{options.blank? ? '?' : '&'}name=#{params[:name]}" unless params[:name].blank?
uri = URI::escape(url + options) uri = URI::escape(url + options)
@ -78,8 +62,8 @@ class PagesController < ApplicationController
url = "/#{@item.path}" url = "/#{@item.path}"
options = '' options = ''
options << "#{options.blank? ? '?' : '&'}id=#{params[:id]}" unless params[:id].blank? options << "#{options.blank? ? '?' : '&'}id=#{params[:id]}" unless params[:id].blank?
options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank? options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id', params[:category_id])}" unless params[:category_id].blank?
options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank? options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id', params[:tag_id])}" unless params[:tag_id].blank?
options << "#{options.blank? ? '?' : '&'}preview=#{params[:preview]}" unless params[:preview].blank? options << "#{options.blank? ? '?' : '&'}preview=#{params[:preview]}" unless params[:preview].blank?
options << "#{options.blank? ? '?' : '&'}controller_action=#{params[:controller_action]}" unless params[:controller_action].blank? options << "#{options.blank? ? '?' : '&'}controller_action=#{params[:controller_action]}" unless params[:controller_action].blank?
options << "#{options.blank? ? '?' : '&'}clicked_field_name=#{params[:clicked_field_name]}" unless params[:clicked_field_name].blank? options << "#{options.blank? ? '?' : '&'}clicked_field_name=#{params[:clicked_field_name]}" unless params[:clicked_field_name].blank?
@ -98,22 +82,43 @@ class PagesController < ApplicationController
elsif params[:same_page_id] elsif params[:same_page_id]
@item = Item.find(params[:same_page_id]) @item = Item.find(params[:same_page_id])
else else
category_ids = params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]] unless params[:category_id].nil? category_ids = Array(params[:category_id]) unless params[:category_id].nil?
tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]] unless params[:tag_id].nil? tag_ids = Array(params[:tag_id]) unless params[:tag_id].nil?
module_app = ModuleApp.first(:conditions => {:key => params[:app_name]}) module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
default_query = { is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'] }
specific_categories = { :category => category_ids }
in_categories = { :category.in => category_ids }
nil_categories = { :category.in => [nil, []] }
specific_tags = { :tag => tag_ids }
in_tags = { :tag.in => tag_ids }
nil_tags = { :tag.in => [nil, []] }
if !category_ids.blank? && !tag_ids.blank? if !category_ids.blank? && !tag_ids.blank?
@item = Item.first(:conditions => {is_published: true, :module_app_id => module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'], :category.in => category_ids, :tag.in => tag_ids}) @item = Item.where(default_query.merge(specific_categories).merge(specific_tags)).first
@item = Item.first(:conditions => {is_published: true, :module_app_id => module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'], :category.in => category_ids, :tag.in => [nil, []]}) unless @item @item = Item.where(default_query.merge(specific_categories).merge(in_tags)).first unless @item
@item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first unless @item
@item = Item.where(default_query.merge(specific_tags).merge(in_categories)).first unless @item
@item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first unless @item
@item = Item.where(default_query.merge(in_categories).merge(in_tags)).first unless @item
@item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
@item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
elsif !category_ids.blank? elsif !category_ids.blank?
@item = Item.where(is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'], :category.in => category_ids).any_in(tag: [nil, []]).first @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first
@item = Item.where(default_query.merge(specific_categories)).first unless @item
@item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
@item = Item.where(default_query.merge(in_categories)).first unless @item
elsif !tag_ids.blank? elsif !tag_ids.blank?
@item = Item.where(is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'], :tag.in => tag_ids).any_in(category: [nil, []]).first @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first
@item = Item.where(default_query.merge(specific_tags)).first unless @item
@item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
@item = Item.where(default_query.merge(in_tags)).first unless @item
end end
@item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank? @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
@item = Item.where(is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget']).all_of("tag" => {"$in" => [nil, []]},"category" => { "$in" => [nil, []]}).first unless @item @item = Item.where(default_query.merge(nil_categories).merge(nil_tags)).first unless @item
@item = Item.where(is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget']).first unless @item @item = Item.where(default_query).first unless @item
end end
raise PageError,'Missing Frontend Page' if @item.nil? raise PageError, 'Missing Frontend Page' if @item.nil?
end end
def save_from_no_lang_for_page def save_from_no_lang_for_page

4
app/helpers/application_helper.rb
View File

@ -315,4 +315,8 @@ module ApplicationHelper
link_to title, params.merge({direction: direction, sort: column, sort_options: column}), {:class => "#{css_class} sortable", :remote => options[:remote]} link_to title, params.merge({direction: direction, sort: column, sort_options: column}), {:class => "#{css_class} sortable", :remote => options[:remote]}
end end
def convert_array_param(key, array)
Array(array).collect{|t| "#{key}[]=#{t}"}.join("&")
end
end end

9
app/helpers/default_widget_helper.rb
View File

@ -84,4 +84,13 @@ module DefaultWidgetHelper
content_tag(:span,get_display(row_data,field_setting),:class=>field_setting[:class]) content_tag(:span,get_display(row_data,field_setting),:class=>field_setting[:class])
end end
end end
def get_row_category(row_data)
row_data.send("#{row_data.class.to_s.underscore}_category_id") rescue nil
end
def get_row_tags(row_data)
row_data.tagged_ids rescue nil
end
end end

31
app/views/default_widget/_typeA.html.erb
View File

@ -1,19 +1,22 @@
<%= content_tag :div,:class=>@tag_class do%> <%= content_tag :div, class: @tag_class do %>
<div class="default_widget_type_A"> <div class="default_widget_type_A">
<table class="default_widget_tb" border="0" cellpadding="0" cellspacing="0" > <table class="default_widget_tb" border="0" cellpadding="0" cellspacing="0" >
<thead> <thead>
<tr> <tr>
<% @frontend_field_names.each_with_index do |field,index|%> <% @frontend_field_names.each_with_index do |field, index| %>
<%= content_tag(:th,content_tag(:span,get_field_header(field),:class=>@frontend_classes[index]))unless field.blank?%> <%= content_tag(:th, content_tag(:span, get_field_header(field), class: @frontend_classes[index])) unless field.blank? %>
<% end %>
</tr>
</thead>
<% @data.each do |row_data| %>
<tr class="<%= get_top_hot_class(row_data) %>">
<% @frontend_field_names.each_with_index do |field,index|%>
<%= content_tag(:td,content_tag(:span,link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]))unless field.blank?%>
<% end %> <% end %>
</tr> </tr>
<% end %> </thead>
<tbody>
<% @data.each do |row_data| %>
<tr class="<%= get_top_hot_class(row_data) %>">
<% @frontend_field_names.each_with_index do |field, index|%>
<%= content_tag(:td, content_tag(:span, link_to_field(row_data, field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index])) unless field.blank? %>
<% end %>
</tr>
<% end %>
</tbody>
</table> </table>
<% end %> </div>
<% end %>

10
app/views/default_widget/_typeB.html.erb
View File

@ -1,13 +1,13 @@
<%= content_tag :div,:class=>@tag_class do%> <%= content_tag :div, class: @tag_class do %>
<ul class="default_widget_list"> <ul class="default_widget_list">
<% @data.each do |row_data| %> <% @data.each do |row_data| %>
<%= content_tag(:li,:class=>get_top_hot_class(row_data)) do %> <%= content_tag(:li, class: get_top_hot_class(row_data)) do %>
<div class="img app-pic"> <div class="img app-pic">
<%= image_tag row_data.send(@widget_image_field)%> <%= image_tag row_data.send(@widget_image_field) %>
</div> </div>
<div class="wrap"> <div class="wrap">
<% @frontend_field_names.each_with_index do |field,index|%> <% @frontend_field_names.each_with_index do |field, index| %>
<%= content_tag(:span,link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]) unless field.blank?%> <%= content_tag(:span, link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index]) unless field.blank? %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

10
app/views/default_widget/_typeC.html.erb
View File

@ -1,12 +1,12 @@
<%= content_tag :div,:class=>@tag_class do%> <%= content_tag :div, class: @tag_class do %>
<div class="img app-pic"> <div class="img app-pic">
<%= image_tag @data.first.send(@widget_image_field)%> <%= image_tag @data.first.send(@widget_image_field) %>
</div> </div>
<ul class="default_widget_list"> <ul class="default_widget_list">
<% @data.each do |row_data| %> <% @data.each do |row_data| %>
<%= content_tag(:li,:class=>get_top_hot_class(row_data)) do %> <%= content_tag(:li, class: get_top_hot_class(row_data)) do %>
<% @frontend_field_names.each_with_index do |field,index|%> <% @frontend_field_names.each_with_index do |field, index|%>
<%= content_tag(:span, link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]) unless field.blank?%> <%= content_tag(:span, link_to_field(row_data, field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index]) unless field.blank? %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>

1
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb vendored
View File

@ -41,7 +41,6 @@ class Panel::WebResource::FrontEnd::WebLinksController < OrbitWidgetController
if params[:tag_id].blank? if params[:tag_id].blank?
categories[category.title] = category.web_links.can_display.desc( :is_top, :created_at ) categories[category.title] = category.web_links.can_display.desc( :is_top, :created_at )
else else
debugger
categories[category.title] = category.web_links.can_display.any_in(:tagged_ids => params[:tag_id]).desc( :is_top, :created_at ) categories[category.title] = category.web_links.can_display.any_in(:tagged_ids => params[:tag_id]).desc( :is_top, :created_at )
end end
end end