Do not show announcement in json and rss if no title in I18n.locale (fix 2)
This commit is contained in:
		
							parent
							
								
									e851395f79
								
							
						
					
					
						commit
						c4ca7f450a
					
				| 
						 | 
					@ -327,6 +327,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 | 
				
			||||||
  def get_bulletins
 | 
					  def get_bulletins
 | 
				
			||||||
    I18n.locale = params[:locale] || :zh_tw
 | 
					    I18n.locale = params[:locale] || :zh_tw
 | 
				
			||||||
    bulletins = params[:category_id] ? Bulletin.where(bulletin_category_id: params[:category_id]).order_by(:created_at, :desc) : Bulletin.all.order_by(:created_at, :desc)
 | 
					    bulletins = params[:category_id] ? Bulletin.where(bulletin_category_id: params[:category_id]).order_by(:created_at, :desc) : Bulletin.all.order_by(:created_at, :desc)
 | 
				
			||||||
 | 
					    bulletins = bulletins.reject{|b| b.title_translations[I18n.locale.to_s].blank?}
 | 
				
			||||||
    @bulletins = Kaminari.paginate_array(bulletins).page(params[:page]).per(params[:per] || 10)
 | 
					    @bulletins = Kaminari.paginate_array(bulletins).page(params[:page]).per(params[:per] || 10)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    respond_to do |format|
 | 
					    respond_to do |format|
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue