Changeset 5816
- Timestamp:
- 06/30/08 08:30:07 (2 months ago)
- Files:
-
- rubricks_core/trunk/app/models/rubricks_lib/rubricks_search_lib.rb (modified) (1 diff)
- rubricks_core/trunk/app/models/rubricks_mailer.rb (modified) (2 diffs)
- rubricks_core/trunk/app/models/rubricks_schedule_manager.rb (modified) (1 diff)
- rubricks_core/trunk/app/models/rubricks_user.rb (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
rubricks_core/trunk/app/models/rubricks_lib/rubricks_search_lib.rb
r5553 r5816 192 192 temp_query.sub!(/^AND\ /, '') 193 193 temp_query.sub!(/^OR\ /, '') 194 temp_query = "OR (#{temp_query}) " 195 query << temp_query 194 unless temp_query.blank? 195 temp_query = "OR (#{temp_query}) " 196 query << temp_query 197 end 196 198 end 197 199 query.sub!(/^OR\ /, '') rubricks_core/trunk/app/models/rubricks_mailer.rb
r5744 r5816 32 32 @mail.body = line_break(@mail.body) 33 33 @mail.body = RubricksLib.convert('convert_mail_body', @mail.body) 34 language = (RubricksLib.current_user && !RubricksLib.guest?) ? RubricksLib.current_user.language : RubricksConfig.get('site_default_language') 35 TMail::Encoder::OPTIONS['UTF8'] = (language == 'japanese') ? '-M' : nil 34 36 end 35 37 … … 76 78 end 77 79 end 78 79 TMail::Encoder::OPTIONS['UTF8'] = '-M'rubricks_core/trunk/app/models/rubricks_schedule_manager.rb
r5781 r5816 1 1 class RubricksScheduleManager 2 long_scope_attr_accessor :adapters_attr =>[]2 @@adapters_attr = [] 3 3 4 4 class << self 5 5 def add_adapter(adapter) 6 get_adapters_attr << adapter unless get_adapters_attr.include?(adapter)6 @@adapters_attr << adapter unless @@adapters_attr.include?(adapter) 7 7 end 8 8 alias :<< :add_adapter unless method_defined?(:<<) 9 9 10 10 def delete_adapter(adapter) 11 get_adapters_attr.delete(adapter)11 @@adapters_attr.delete(adapter) 12 12 end 13 13 14 14 def change_schedule(schedule) 15 15 adapter = find_adapter(schedule.adapter) 16 adapter.change(schedule) if adapter 16 adapter.change(schedule) if adapter && installed?(adapter) 17 17 end 18 18 19 19 def delete_schedule(adapter_id, schedule_id) 20 20 adapter = find_adapter(adapter_id) 21 adapter.delete(schedule_id) if adapter 21 adapter.delete(schedule_id) if adapter && installed?(adapter) 22 22 end 23 23 24 24 def schedules(params) 25 25 result = [] 26 get_adapters_attr.each do |a| 27 s_array = a.schedules(params) 28 s_array.each do |s| 29 s.adapter = a.object_id 30 result << s 26 @@adapters_attr.each do |a| 27 s_array = a.schedules(params) if a && installed?(a) 28 (s_array || []).each do |s| 29 begin 30 s.adapter = a.object_id 31 s.start = s.start.is_a?(Time) ? s.start : s.start.to_time 32 result << s 33 rescue => ex 34 logger.error ex.message 35 logger.error ex.backtrace.join("\n") 36 end 31 37 end 32 38 end 33 result.sort do |a, b| 34 a_start = a_start.is_a?(Time) ? a.start : a.start.to_time 35 b_start = b_start.is_a?(Time) ? b.start : b.start.to_time 36 a_start <=> b_start 37 end 39 result.sort { |a, b| a.start <=> b.start } 38 40 end 39 41 40 42 private 41 43 def find_adapter(id) 42 get_adapters_attr.find { |a| a.object_id == id } 44 @@adapters_attr.find { |a| a.object_id == id } 45 end 46 47 def installed?(adapter) 48 RubricksComponent.exists?(["name = ?", adapter.name.underscore.split("/").first]) 43 49 end 44 50 end rubricks_core/trunk/app/models/rubricks_user.rb
r5781 r5816 181 181 filter_conditions[:conditions] = RubricksLib.query_to_conditions(filter_conditions_hash[:user_word], ['rubricks_users.login_name']) 182 182 end 183 filter_conditions[:order] = 'rubricks_users.login_name'183 filter_conditions[:order] = ['rubricks_users.login_name'] 184 184 when 'email' 185 185 if filter_conditions_hash[:user_word].blank? … … 193 193 end 194 194 end 195 filter_conditions[:order] = 'rubricks_users.email_by_admin'195 filter_conditions[:order] = ['rubricks_users.email_by_admin'] 196 196 else 197 197 target = (RubricksLib.current_lang == 'japanese') ? ['rubricks_users.kana', 'rubricks_users.name'] : ['rubricks_users.name'] … … 201 201 filter_conditions[:conditions] = RubricksLib.query_to_conditions(filter_conditions_hash[:user_word], target) 202 202 end 203 filter_conditions[:order] = 'rubricks_users.kana, rubricks_users.name'203 filter_conditions[:order] = ['rubricks_users.kana', 'rubricks_users.name'] 204 204 end 205 205 case filter_conditions_hash[:user_type] … … 217 217 query = "rubricks_users.effective = true and rubricks_users.certified != ''" + ((query.blank?) ? '' : " and (#{query})") 218 218 filter_conditions[:conditions].unshift(query) 219 else219 when 'valid' 220 220 query = filter_conditions[:conditions].shift 221 221 query = "rubricks_users.effective = true and rubricks_users.certified = '' and (rubricks_users.locked_till is NULL or rubricks_users.locked_till <= ?)" + ((query.blank?) ? '' : " and (#{query})") 222 222 filter_conditions[:conditions].unshift(DateTime.now) 223 223 filter_conditions[:conditions].unshift(query) 224 else 225 query = filter_conditions[:conditions].shift 226 query = "rubricks_users.effective = true and rubricks_users.certified = ''" + ((query.blank?) ? '' : " and (#{query})") 227 filter_conditions[:conditions].unshift(query) 224 228 end 225 229 case filter_conditions_hash[:user_sequence] 226 230 when 'desc' 227 filter_conditions[:order] += ' desc'228 else 229 filter_conditions[:order] += ' asc'231 filter_conditions[:order] = filter_conditions[:order].map{|order| order += ' desc'}.join(',') 232 else 233 filter_conditions[:order] = filter_conditions[:order].map{|order| order += ' asc'}.join(',') 230 234 end 231 235 filter_conditions[:page] = filter_conditions_hash[:user_page]
