Skip to content

Commit 2f594a8

Browse files
authored
Merge pull request #5 from kencove/unlock-conditions-ui-ce
Unlock conditions and formula UI in CE
2 parents acc189b + 3609629 commit 2f594a8

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

app/javascript/template_builder/builder.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,12 +879,12 @@ export default {
879879
withFormula: {
880880
type: Boolean,
881881
required: false,
882-
default: false
882+
default: true
883883
},
884884
withConditions: {
885885
type: Boolean,
886886
required: false,
887-
default: false
887+
default: true
888888
},
889889
withGoogleDrive: {
890890
type: Boolean,

app/javascript/template_builder/conditions_modal.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,6 @@ export default {
231231
return actions
232232
},
233233
validateSaveAndClose () {
234-
if (!this.withConditions) {
235-
return alert(this.t('available_only_in_pro'))
236-
}
237-
238234
if (this.conditions.find((f) => f.field_uuid)) {
239235
this.item.conditions = this.conditions
240236
} else {

app/javascript/template_builder/formula_modal.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,6 @@ export default {
194194
})
195195
},
196196
validateSaveAndClose () {
197-
if (!this.withFormula) {
198-
return alert(this.t('available_only_in_pro'))
199-
}
200-
201197
const normalizedFormula = this.normalizeFormula(this.formula)
202198
203199
if (normalizedFormula.includes('FIELD NOT FOUND')) {

0 commit comments

Comments
 (0)