saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed announcement rendering..

This commit is contained in:
Harry Bomrah 2013-11-08 12:55:15 +08:00 committed by saurabhbhatia
parent 2f61f55be2
commit 9e432a5a93
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb vendored
View File

@ -9,19 +9,30 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
end end
def search_result def search_result
if params[:search_query] == ""
@bulletins = get_bulletins_for_index
else
@search = Bulletin.solr_search do @search = Bulletin.solr_search do
fulltext params[:search_query] fulltext params[:search_query]
with(:frontend_search,true) with(:frontend_search,true)
with(:available_lang).any_of([I18n.locale.to_s]) with(:available_lang).any_of([I18n.locale.to_s])
end end
# @bulletins = Bulletin.where(:category_id.in => params[:category_id]).and(:is_rejected=>false).and(:is_pending=>false)
search_result = @search.results.collect{|result| result.id} search_result = @search.results.collect{|result| result.id}
@bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_in(_id:search_result).page( params[:page_main]).per(@page_num) @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_in(_id:search_result).page( params[:page_main]).per(@page_num)
end
end end
def index def index
@item = Page.find(params[:page_id]) rescue nil
end
def get_bulletins_for_index
@item = Page.find(params[:page_id]) rescue nil
if @item if @item
if @item.frontend_data_count if @item.frontend_data_count
@page_num = @item.frontend_data_count @page_num = @item.frontend_data_count
@ -30,33 +41,24 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
end end
@frontend_style = @item.frontend_style @frontend_style = @item.frontend_style
end end
@item = Page.find(params[:page_id]) rescue nil
if !params[:search_query].blank?
@search = Bulletin.solr_search do
fulltext params[:search_query]
with(:frontend_search,true)
with(:available_lang).any_of([I18n.locale.to_s])
end
search_result = @search.results.collect{|result| result.id}
@bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_in(_id:search_result).page( params[:page_main]).per(@page_num)
else
date_now = Time.now date_now = Time.now
if !params[:category_id].blank? && !params[:tag_id].blank? if !params[:category_id].blank? && !params[:tag_id].blank?
@bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id => params[:category_id], :tagged_ids => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num) @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
# @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id.in=>params[:category_id],:tagged_ids.in=>params[:tag_id])
@current_category = BulletinCategory.from_id(params[:category_id]) rescue nil @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
debugger
elsif !params[:category_id].blank? elsif !params[:category_id].blank?
@bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.where(:category_id => params[:category_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num) @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.where(:category_id.in => params[:category_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
@current_category = BulletinCategory.from_id(params[:category_id]) rescue nil @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
elsif !params[:tag_id].blank? elsif !params[:tag_id].blank?
@bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num) @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
else else
@bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.desc( :is_top, :postdate).page( params[:page_main]).per(@page_num) @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
end end
# delayed_impressionist(@tag) if @tag # delayed_impressionist(@tag) if @tag
end @bulletins
end
end
def show def show
@item = Page.find(params[:page_id]) rescue nil @item = Page.find(params[:page_id]) rescue nil

6
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb vendored
View File

@ -39,7 +39,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
@bulletins = Bulletin.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page] ).per(@page_num) @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page] ).per(@page_num)
end end
@categories = get_categories_for_index @categories = @module_app.categories.enabled
end end
@ -62,7 +62,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
@bulletins = Bulletin.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(@page_num ) @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(@page_num )
end end
@categories = get_categories_for_index @categories = @module_app.categories.enabled
end end
@ -139,7 +139,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
def bulletins_side_bar def bulletins_side_bar
@tags_and_class = @module_app.sorted_tags_for_cloud @tags_and_class = @module_app.sorted_tags_for_cloud
@categories = get_categories_for_index @categories = @module_app.categories.enabled
end end
def bulletins_search_block def bulletins_search_block

1
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb vendored
View File

@ -1,7 +1,6 @@
<% # encoding: utf-8 %> <% # encoding: utf-8 %>
<%= flash_messages %> <%= flash_messages %>
<h1 class="h1"><%= @page.title rescue nil %></h1> <h1 class="h1"><%= @page.title rescue nil %></h1>
<table class="table table-bordered"> <table class="table table-bordered">

3
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/search_result.html.erb vendored
View File

@ -1,7 +1,6 @@
<% # encoding: utf-8 %> <% # encoding: utf-8 %>
<%= flash_messages %> <%= flash_messages %>
<h1 class="h1"><%= @page.title rescue nil %></h1> <h1 class="h1"><%= @page.title rescue nil %></h1>
<table class="table table-bordered"> <table class="table table-bordered">
@ -23,7 +22,7 @@
<% @bulletins.each do |post| %> <% @bulletins.each do |post| %>
<tr> <tr>
<td><%= post.bulletin_category.title rescue nil %></td> <td><%= post.bulletin_category.title rescue nil %></td>
<td><%= link_to post.title, panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %> <td><%= link_to post.title, panel_announcement_front_end_bulletin_path(post, :category_id => post.category_id) %>
<%#= link_to post.title, panel_announcement_back_end_bulletin_path(post) %> <%#= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>
</td> </td>
<td><%= display_date_time(post.postdate) %></td> <td><%= display_date_time(post.postdate) %></td>

4
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb vendored
View File

@ -1,6 +1,6 @@
<%= stylesheet_link_tag "default_widget" %> <%= stylesheet_link_tag "default_widget" %>
<script type='text/javascript' src='/assets/jquery.mu.image.resize.js'></script> <script type='text/javascript' src='/assets/lib/jquery.mu.image.resize.js'></script>
<script type='text/javascript' src='/assets/jquery.mu.image.resize.degsin.js'></script> <!-- <script type='text/javascript' src='/assets/lib/jquery.mu.image.resize.degsin.js'></script> -->
<div id="bulletin_widget"> <div id="bulletin_widget">
<%= render 'index' %> <%= render 'index' %>