From f509e74938dffe8267328dab5cef4fd862e0e074 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Thu, 28 Nov 2013 16:22:03 +0800 Subject: [PATCH] Rescue nil in Albums --- app/controllers/admin/sites_controller.rb | 2 +- app/controllers/application_controller.rb | 5 +++-- .../controllers/panel/gallery/back_end/albums_controller.rb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb index 50d399a9..4b9ee149 100644 --- a/app/controllers/admin/sites_controller.rb +++ b/app/controllers/admin/sites_controller.rb @@ -21,7 +21,7 @@ class Admin::SitesController < OrbitBackendController end def update - params[:site][:defalut_locale] = "zh_tw" if params[:site][:default_locale].blank? + params[:site][:defalut_locale] = nil if params[:site][:default_locale].blank? @site.update_attributes(params[:site]) redirect_to :back end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5ce9657e..0081723d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -162,8 +162,9 @@ class ApplicationController < ActionController::Base #check enable langauge detection browser_locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first rescue nil condition = @site.in_use_locales.include?(browser_locale) - elsif (@site.default_locale.nil? && @site.enable_language_detection.eql?(false)) - condition = @site.valid_locales.first + elsif (@site.default_locale.nil? && @site.enable_language_detection.eql?(false) && session[:locale].nil?) + session[:locale] = @site.valid_locales.first + condition = @site.in_use_locales.include?(session[:locale]) end session[:locale] = condition ? (browser_locale || session[:locale] || default_locale || backup_locale) : I18n.default_locale.to_s 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 c4c52a66..8a6001ef 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 @@ -215,7 +215,7 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController # tagsToAdd will contain all tag ids which ve to be added in tall album_images @images = AlbumImage.all @images.each do |image| - image.tagged_ids.concat(tagsToAdd) + image.tagged_ids.concat(tagsToAdd) if !tagsToAdd.blank? tagsToDestroy.each do |tag| if image.tagged_ids.include?tag image.tagged_ids.delete(tag)