jiang/ask
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated.

Browse Source
This commit is contained in:
bohung committed 2023-02-10 13:34:07 +08:00
1 parent 3177cd48f8
commit 274ea9c71a
6 files changed
+33 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/models/ask_setting.rb
+13 -9
View File
@@ -160,13 +160,14 @@ class AskSetting
end
return sort_number
end
is_default_setting = (ask_setting.class == self)
if override_sort_number.present?
sort_number = override_sort_number
else
sort_number = ask_setting.sort_number
if ask_setting.use_default
if ask_setting.default_sort_number.blank?
sort_number = ((ask_setting.class == self) ? sort_number : self.first.sort_number)
sort_number = (is_default_setting ? sort_number : self.first.sort_number)
else
sort_number = ask_setting.default_sort_number
end
@@ -174,7 +175,7 @@ class AskSetting
ask_setting = self.first
end
end
default_ask_setting = ask_setting.class == self ? ask_setting : self.first
default_ask_setting = is_default_setting ? ask_setting : self.first
disp_fields = self::All_default_fields
disp_fields_infos = {}
locale = I18n.locale.to_s
@@ -222,10 +223,12 @@ class AskSetting
end
max_sort_number = disp_fields_infos.values.map{|v| v}.compact.max
if max_sort_number
max_sort_number = max_sort_number + 1
disp_fields_infos.each_with_index do |(k,v), i|
if v.blank?
disp_fields_infos[k] = max_sort_number + i
if !use_cache || (is_default_setting && override_sort_number.nil?)
max_sort_number = max_sort_number + 1
disp_fields_infos.each_with_index do |(k,v), i|
if v.blank?
disp_fields_infos[k] = max_sort_number + i
end
end
end
disp_fields_infos = disp_fields_infos.sort_by {|_key, value| value}.to_h
@@ -245,6 +248,7 @@ class AskSetting
ask_setting = self.first if ask_setting.nil?
ask_setting = self.create() if ask_setting.nil?
end
is_default_setting = (ask_setting.class == self)
sort_number = nil
if only_display && use_cache
if override_sort_number
@@ -259,7 +263,7 @@ class AskSetting
sort_number = override_sort_number
elsif ask_setting.use_default
if ask_setting.default_sort_number.blank?
sort_number = ((ask_setting.class == self) ? sort_number : self.first.sort_number)
sort_number = (is_default_setting ? sort_number : self.first.sort_number)
else
sort_number = ask_setting.default_sort_number
end
@@ -267,7 +271,7 @@ class AskSetting
ask_setting = self.first
end
end
default_ask_setting = ask_setting.class == self ? ask_setting : self.first
default_ask_setting = is_default_setting ? ask_setting : self.first
disp_fields = self::All_default_fields
disp_fields_infos = {}
locale = I18n.locale.to_s
@@ -331,7 +335,7 @@ class AskSetting
end
max_sort_number = disp_fields_infos.values.map{|h| h["sort_number"]}.compact.max
if max_sort_number
unless use_cache
if !use_cache || (is_default_setting && override_sort_number.nil?)
max_sort_number = max_sort_number + 1
disp_fields_infos.each_with_index do |(k,h), i|
if h["sort_number"].blank?