Skip to content

Commit 72fb9ab

Browse files
changes for new popover mode
1 parent 7d037f4 commit 72fb9ab

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

l10n/find-duplicate-field-values.csv

100644100755
File mode changed.

src/webfrontend/find-duplicate-field-values.coffee

100644100755
Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,16 @@ class FindDublicateFieldValues extends CustomMaskSplitter
125125
if ! isAllowedUse
126126
return CUI.dom.append(@renderInnerFields(opts))
127127

128-
# Gruppeneditor? --> den Splitter nicht nutzen
129-
if opts.bulk && opts.mode == "editor-bulk"
130-
return CUI.dom.append(@renderInnerFields(opts))
128+
# is the splitter in an nested summary?
129+
isInSummary = false
130+
if opts?.__is_in_nested_summary
131+
isInSummary = opts.__is_in_nested_summary
131132

132133
# get inner fields
133134
innerFields = @renderInnerFields(opts)
134135

135-
# no action in detail-mode
136-
if opts.mode == 'detail' || opts.mode == 'expert'
136+
# no action in other modes than editor
137+
if opts.mode != 'editor' || isInSummary == true
137138
return innerFields
138139

139140
configuredField = @getDataOptions()?.fieldtotestforduplicates
@@ -147,7 +148,7 @@ class FindDublicateFieldValues extends CustomMaskSplitter
147148
#####################################################################################
148149
# EDITOR-Mode
149150
#####################################################################################
150-
if opts.mode == "editor" || opts.mode == "editor-bulk"
151+
if opts.mode == "editor" && !isInSummary
151152
if fields
152153
field = fields[0]
153154
innerFieldsCollection = @renderInnerFields(opts)
@@ -162,23 +163,21 @@ class FindDublicateFieldValues extends CustomMaskSplitter
162163
copiedFieldnameBlock = fieldnameblock.cloneNode(true)
163164

164165
# create layout for splitter
166+
# add button, click on button opens the searchresultsdisplay for records, which also have the same value in that field
167+
infoButton = new CUI.Button
168+
text: $$('fylr-plugin-find-duplicate-field-values.info.link')
169+
class: 'fylr-plugin-find-duplicate-field-values-info-found-link'
170+
icon_left: new CUI.Icon(class: "fa-info-circle")
171+
size: "big"
172+
appearance: "link"
173+
onClick: originalOnClick
174+
165175
verticalLayout = new CUI.VerticalLayout
166176
class: "fylr-plugin-default-values-from-pool editormode"
167177
maximize: true
168-
#top:
169-
# class: 'fylr-plugin-default-values-from-pool-header'
170-
# content: copiedFieldnameBlock
171178
center:
172179
content:
173-
# Icon hinzufügen. Bei klick auf Icon vom Label öffnet sich ein
174-
# modal, welches die Infos über die Dubletten beinhalten
175-
infoButton = new CUI.Button
176-
text: $$('fylr-plugin-find-duplicate-field-values.info.link')
177-
class: 'fylr-plugin-find-duplicate-field-values-info-found-link'
178-
icon_left: new CUI.Icon(class: "fa-info-circle")
179-
size: "big"
180-
appearance: "link"
181-
onClick: originalOnClick
180+
infoButton
182181
bottom:
183182
content:
184183
new CUI.HorizontalLayout
@@ -191,7 +190,7 @@ class FindDublicateFieldValues extends CustomMaskSplitter
191190
# infoButton is hidden by default
192191
infoButton.hide()
193192

194-
# wenn Feld einen Wert hat, dann Suche ausführen
193+
# if field has a value, search for dublicate values
195194
if opts.data[field.ColumnSchema.name]
196195
# do search
197196
fieldValue = opts.data[field.ColumnSchema.name]

0 commit comments

Comments
 (0)