didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix formula with conditions

Browse Source
This commit is contained in:
Pete Matsyburka
2025-01-09 22:25:46 +02:00
parent fe3e8fba3e
commit 1984b99e04
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/submission_form/area.vue
+4 -1
View File
@@ -197,7 +197,10 @@
<span v-else-if="field.type === 'date'"> <span v-else-if="field.type === 'date'">
{{ formattedDate }} {{ formattedDate }}
</span> </span>
<span v-else-if="field.type === 'number'"> <span
v-else-if="field.type === 'number'"
class="w-full"
>
{{ formatNumber(modelValue, field.preferences?.format) }} {{ formatNumber(modelValue, field.preferences?.format) }}
</span> </span>
<span <span
lib/submitters/submit_values.rb
+1 -1
View File
@@ -54,8 +54,8 @@ module Submitters
submitter.ip = request.remote_ip submitter.ip = request.remote_ip
submitter.ua = request.user_agent submitter.ua = request.user_agent
submitter.values = merge_default_values(submitter) submitter.values = merge_default_values(submitter)
submitter.values = merge_formula_values(submitter)
submitter.values = maybe_remove_condition_values(submitter) submitter.values = maybe_remove_condition_values(submitter)
submitter.values = merge_formula_values(submitter)
submitter.values = submitter.values.transform_values do |v| submitter.values = submitter.values.transform_values do |v|
v == '{{date}}' ? Time.current.in_time_zone(submitter.account.timezone).to_date.to_s : v v == '{{date}}' ? Time.current.in_time_zone(submitter.account.timezone).to_date.to_s : v
end end