Skip to content

Commit 569d517

Browse files
fixed for popovermode after 6.17
1 parent de7f90b commit 569d517

File tree

1 file changed

+32
-27
lines changed

1 file changed

+32
-27
lines changed

src/webfrontend/mask-splitter-default-values.coffee

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class ez5.ShowPoolDefaultValuesInMask extends CustomMaskSplitter
1515
return true
1616

1717
renderField: (opts) ->
18+
1819
that = @
1920

2021
CUI.Events.registerEvent
@@ -24,24 +25,29 @@ class ez5.ShowPoolDefaultValuesInMask extends CustomMaskSplitter
2425
# get objecttype-name
2526
objecttype = opts.top_level_data?._objecttype
2627

27-
# Gruppeneditor --> den Splitter nicht nutzen
28-
if opts.bulk && opts.mode == "editor-bulk"
29-
return CUI.dom.append(@renderInnerFields(opts))
28+
# is splitter in summary of popover-mode?
29+
isInSummary = false
30+
if opts?.__is_in_nested_summary
31+
isInSummary = opts.__is_in_nested_summary
3032

31-
# Expertensuche --> den Splitter nicht nutzen
32-
if opts.mode == "expert"
33-
return CUI.dom.append(@renderInnerFields(opts))
33+
# poolid
34+
poolID = false
35+
if opts?.top_level_data
36+
if opts?.top_level_data[objecttype]
37+
if opts?.top_level_data[objecttype]?._pool?.pool?._id
38+
poolID = opts?.top_level_data[objecttype]?._pool?.pool?._id
3439

35-
# Keine PoolID vergeben? --> den Splitter nicht nutzen
36-
poolID = opts.top_level_data[objecttype]?._pool?.pool?._id
37-
if ! poolID
38-
return CUI.dom.append(@renderInnerFields(opts))
40+
# Gruppeneditor / Expertensuche / nested summary / keine poolID --> den Splitter nicht nutzen
41+
if (opts.bulk && opts.mode == "editor-bulk") || opts.mode == "expert" || isInSummary || !poolID
42+
div = CUI.dom.element("div", class: "fylr-plugin-default-values-from-pool" )
43+
return CUI.dom.append(div, @renderInnerFields(opts))
3944

4045
# poolid natürlich entsprechend oben auslesen und unten einsetzen
4146
poolInfo = ez5.pools.findPoolById(poolID)
42-
43-
if ! poolInfo
44-
return CUI.dom.append(@renderInnerFields(opts))
47+
# poolinfo da?
48+
if !poolInfo
49+
div = CUI.dom.element("div", class: "fylr-plugin-default-values-from-pool" )
50+
return CUI.dom.append(div, @renderInnerFields(opts))
4551

4652
customDataFromPool = poolInfo.data.pool.custom_data
4753

@@ -80,7 +86,6 @@ class ez5.ShowPoolDefaultValuesInMask extends CustomMaskSplitter
8086
copiedFieldnameBlock = fieldnameblock.cloneNode(true)
8187

8288
selectedElement.querySelector('.ez5-field-block-header').style.display = 'none'
83-
8489
# in input einen placeholder setzen
8590
testForInput = selectedElement.querySelector('.cui-input input')
8691
if testForInput
@@ -175,14 +180,14 @@ class ez5.ShowPoolDefaultValuesInMask extends CustomMaskSplitter
175180
content: defaultLabelElement
176181
bottom:
177182
content:
178-
new CUI.HorizontalLayout
179-
class: "fylr-plugin-default-values-from-pool-input-layout"
180-
left:
181-
content: ''
182-
center:
183-
content: innerFieldsCollection
184-
right:
185-
content: xButton
183+
new CUI.HorizontalLayout
184+
class: "fylr-plugin-default-values-from-pool-input-layout"
185+
left:
186+
content: ''
187+
center:
188+
content: innerFieldsCollection
189+
right:
190+
content: xButton
186191

187192

188193
####################################################################
@@ -237,7 +242,9 @@ class ez5.ShowPoolDefaultValuesInMask extends CustomMaskSplitter
237242
node: selectedElement
238243
bubble: true
239244

240-
return CUI.dom.append(verticalLayout)
245+
div = CUI.dom.element("div", class: "fylr-plugin-default-values-from-pool" )
246+
return CUI.dom.append(div, verticalLayout)
247+
241248

242249
#####################################################################################
243250
# DETAIL-Mode
@@ -298,12 +305,10 @@ class ez5.ShowPoolDefaultValuesInMask extends CustomMaskSplitter
298305
text: cuiLabelLabel
299306
class: 'fylr-plugin-default-values-from-pool-default-value'
300307

301-
return CUI.dom.append(verticalLayout)
302-
308+
div = CUI.dom.element("div", class: "fylr-plugin-default-values-from-pool" )
309+
return CUI.dom.append(div, verticalLayout)
303310
return
304311

305-
#return innerFields
306-
307312
getOptions: ->
308313
# get available fields from baseconfig and choose only those, who match the objecttype
309314
baseConfig = ez5.session.getBaseConfig("plugin", "default-values-from-pool")

0 commit comments

Comments
 (0)