sorting changed and also entries removed without title
This commit is contained in:
parent
c0d12158c4
commit
622dce7924
|
@ -30,17 +30,19 @@ namespace :announcement_link_widget do
|
||||||
end
|
end
|
||||||
|
|
||||||
if common_tags_frontend.size > 0
|
if common_tags_frontend.size > 0
|
||||||
Bulletin.all.can_display.is_approved.order_by(:created_at=>'desc').each do |ann|
|
Bulletin.all.can_display.is_approved.order_by(:postdate=>'desc').each do |ann|
|
||||||
intersection = ann.tags & an_tags
|
intersection = ann.tags & an_tags
|
||||||
if intersection.size > 0
|
if intersection.size > 0
|
||||||
intersection.each do |t|
|
intersection.each do |t|
|
||||||
name = t.name.downcase.gsub(" ", "_")
|
name = t.name.downcase.gsub(" ", "_")
|
||||||
index = common_tags_frontend.index{|t| t["tag-id"] == name}
|
index = common_tags_frontend.index{|t| t["tag-id"] == name}
|
||||||
ctf = common_tags_frontend[index]
|
ctf = common_tags_frontend[index]
|
||||||
|
if ann.title_translations[locale.to_s] != ""
|
||||||
ctf["announcements"] << {"title" => ann.title_translations[locale.to_s],"link"=>OrbitHelper.widget_item_url(ann.to_param)}
|
ctf["announcements"] << {"title" => ann.title_translations[locale.to_s],"link"=>OrbitHelper.widget_item_url(ann.to_param)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
WebLink.all.can_display.order_by(:created_at=>'desc').each do |wl|
|
WebLink.all.can_display.order_by(:created_at=>'desc').each do |wl|
|
||||||
intersection = wl.tags & l_tags
|
intersection = wl.tags & l_tags
|
||||||
|
@ -50,10 +52,12 @@ namespace :announcement_link_widget do
|
||||||
name = t.name.downcase.gsub(" ", "_")
|
name = t.name.downcase.gsub(" ", "_")
|
||||||
index = common_tags_frontend.index{|t| t["tag-id"] == name}
|
index = common_tags_frontend.index{|t| t["tag-id"] == name}
|
||||||
ctf = common_tags_frontend[index]
|
ctf = common_tags_frontend[index]
|
||||||
|
if wl.title_translations[locale.to_s] != ""
|
||||||
ctf["links"] << {"title" => wl.title_translations[locale.to_s],"url" => wl.url_translations[locale.to_s]}
|
ctf["links"] << {"title" => wl.title_translations[locale.to_s],"url" => wl.url_translations[locale.to_s]}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
# debugger
|
# debugger
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue