From 93424e1972da1a838ed5ac31ddd1802c5379fee5 Mon Sep 17 00:00:00 2001
From: ruling <ruling8881@WWW-U.ntue.edu.tw>
Date: Tue, 17 Sep 2013 20:55:03 +0800
Subject: [PATCH] Fix link frontend and gallery json

---
 .../app/controllers/panel/gallery/back_end/albums_controller.rb | 2 +-
 .../views/panel/web_resource/front_end/web_links/index.html.erb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
index 177a290b4..7f9094c94 100644
--- a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
+++ b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
@@ -3,7 +3,7 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
 
   # before_filter :force_order_for_user, :except => [:index,:get_album_json,:get_imgs_json]
 
-  before_filter :force_order_for_visitor,:only=>[:index,:show,:get_album_json,:get_imgs_json,:get_albums,:imgs]
+  before_filter :force_order_for_visitor,:only=>[:index,:show,:get_albums,:imgs]
   before_filter :force_order_for_user,:except => [:index,:show,:get_album_json,:get_imgs_json,:get_albums,:imgs]
   before_filter :for_app_sub_manager,:except => [:index,:show,:get_album_json,:get_imgs_json,:get_albums,:imgs]
   # before_filter lambda
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb
index 2b85372e3..e52af6a9a 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb
@@ -10,11 +10,13 @@
 						<div class="o-links-list">
 							<ul>
 								<% web_links.page(params[:page_main]).per(@page_num).each do |web_link| %>
+								<% if !web_link.title.blank? %>
 									<li>
 										<%= link_to web_link.title, web_link.url, {:target => '_blank', :title => web_link.title, :class=>"o-links-title"} %>
 										<div class="o-links-description"><%= web_link.context %></div>
 									</li>
 								<% end %>
+								<% end %>
 							</ul>
 						</div>
 					</li>