app/controllers/tr8n/language_cases_controller.rb in tr8n-3.1.1 vs app/controllers/tr8n/language_cases_controller.rb in tr8n-3.1.2

- old
+ new

@@ -1,7 +1,7 @@ #-- -# Copyright (c) 2010-2011 Michael Berkovich +# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, @@ -19,64 +19,62 @@ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -class Tr8n::LanguageCasesController < Tr8n::BaseController +module Tr8n + class LanguageCasesController < Tr8n::BaseController - before_filter :validate_current_translator - before_filter :validate_language_management, :only => [:index] + before_filter :validate_current_translator + before_filter :validate_language_management, :only => [:index] - # used by a client app - def index - conditions = ["language_id = ? and (reported is null or reported = ?)", tr8n_current_language.id, false] - - unless params[:search].blank? - conditions[0] << " and keyword like ?" - conditions << "%#{params[:search]}%" + # used by a client app + def index + @maps = Tr8n::LanguageCaseValueMap.where("language_id = ? and (reported is null or reported = ?)", tr8n_current_language.id, false) + @maps = @maps.where("keyword like ?", "%#{params[:search]}%") unless params[:search].blank? + @maps = @maps.order("updated_at desc").page(page).per(per_page) end - - @maps = Tr8n::LanguageCaseValueMap.paginate(:per_page => per_page, :page => page, :conditions => conditions, :order => "updated_at desc") - end - def manager - @lcase = Tr8n::LanguageCase.by_id(params[:case_id]) unless params[:case_id].blank? - @rule = Tr8n::LanguageCaseRule.by_id(params[:rule_id]) unless params[:rule_id].blank? + def manager + @lcase = Tr8n::LanguageCase.by_id(params[:case_id]) unless params[:case_id].blank? + @rule = Tr8n::LanguageCaseRule.by_id(params[:rule_id]) unless params[:rule_id].blank? - @map = Tr8n::LanguageCaseValueMap.by_language_and_keyword(tr8n_current_language, params[:case_key]) - @map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :translator => tr8n_current_translator, :keyword => params[:case_key]) + @map = Tr8n::LanguageCaseValueMap.by_language_and_keyword(tr8n_current_language, params[:case_key]) + @map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :translator => tr8n_current_translator, :keyword => params[:case_key]) - render :layout => false - end + render :layout => false + end - def switch_manager_mode - @map = Tr8n::LanguageCaseValueMap.by_language_and_keyword(tr8n_current_language, params[:map_keyword]) - @map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :keyword => params[:case_key], :reported => false) + def switch_manager_mode + @map = Tr8n::LanguageCaseValueMap.by_language_and_keyword(tr8n_current_language, params[:map_keyword]) + @map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :keyword => params[:case_key], :reported => false) - render :partial => params[:mode] - end + render :partial => params[:mode] + end - def update_value_map - map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) unless params[:map_id].blank? - map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :reported => false) - map.keyword = params[:case_key] - map.map = params[:map][:map] - map.save_with_log!(tr8n_current_translator) + def update_value_map + map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) unless params[:map_id].blank? + map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :reported => false) + map.keyword = params[:case_key] + map.map = params[:map][:map] + map.save_with_log!(tr8n_current_translator) - redirect_to_source - end + redirect_to_source + end - def delete_value_map - map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) if params[:map_id] - map.destroy_with_log!(tr8n_current_translator) if map + def delete_value_map + map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) if params[:map_id] + map.destroy_with_log!(tr8n_current_translator) if map - redirect_to_source - end + redirect_to_source + end - def report_value_map - map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) unless params[:map_id].blank? - map.report_with_log!(tr8n_current_translator) if map + def report_value_map + map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) unless params[:map_id].blank? + map.report_with_log!(tr8n_current_translator) if map - redirect_to_source - end + redirect_to_source + end -end + end +end + \ No newline at end of file