Skip to content

Commit 7d41292

Browse files
added online-editor-display
1 parent e102c38 commit 7d41292

File tree

7 files changed

+20
-4
lines changed

7 files changed

+20
-4
lines changed

.github/release.yml

100644100755
File mode changed.

.github/workflows/release.yml

100644100755
File mode changed.

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@ build: clean ## clean, compile, copy files to build folder
2727
cp easydb-library/src/commons.coffee src/tmp
2828
cp src/webfrontend/*.coffee src/tmp
2929
cd src/tmp && coffee -b --compile ${COFFEE_FILES} # bare-parameter is obligatory!
30-
cat src/tmp/*.js > build/$(PLUGIN_NAME)/webfrontend/customDataTypeGfbio.js
30+
31+
cat src/tmp/commons.js >> build/$(PLUGIN_NAME)/webfrontend/customDataTypeGfbio.js
32+
33+
cat src/tmp/CustomDataTypeGFBIO.js >> build/$(PLUGIN_NAME)/webfrontend/customDataTypeGfbio.js
34+
cat src/tmp/CustomDataTypeGFBIOFacet.js >> build/$(PLUGIN_NAME)/webfrontend/customDataTypeGfbio.js
35+
cat src/tmp/CustomDataTypeGFBIOTreeview.js >> build/$(PLUGIN_NAME)/webfrontend/customDataTypeGfbio.js
36+
cat src/tmp/GFBIOUtilities.js >> build/$(PLUGIN_NAME)/webfrontend/customDataTypeGfbio.js
3137

3238
cp src/updater/GFBIOUpdater.js build/$(PLUGIN_NAME)/updater/GfbioUpdater.js # build updater
3339
cat src/tmp/GFBIOUtilities.js >> build/$(PLUGIN_NAME)/updater/GfbioUpdater.js

easydb-library

l10n/customDataTypeGfbio.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,6 @@ custom.data.type.commons.controls.detailinfo.label,Detailinfo, Details
6262
custom.data.type.commons.controls.calluri.label,Uri aufrufen,Call URI
6363
custom.data.type.commons.controls.delete.label,Löschen,Delete
6464
custom.data.type.gfbio.config.parameter.mask.overwrite_ontology_configuration.value.label,Ontology-Konfiguration aus Schema überschreiben,Overwrite ontology-configuration from schema
65+
custom.data.type.gfbio.config.parameter.mask.editor_display.value.label,Editor-Ansicht,Editor-Display
66+
custom.data.type.gfbio.config.option.mask.editor_display.value.default,Standard,Default
67+
custom.data.type.gfbio.config.option.mask.editor_display.value.condensed,1 Zeile,One-liner

manifest.master.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ custom_types:
4040
value:
4141
type: select
4242
options: ["popover", "popover_treeview"]
43+
- name: editor_display
44+
parameters:
45+
value:
46+
type: select
47+
options: ["default", "condensed"]
4348
- name: overwrite_ontology_configuration
4449
parameters:
4550
value:

src/webfrontend/CustomDataTypeGFBIOTreeview.coffee

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ class GFBIO_ListViewTreeNode extends CUI.ListViewTreeNode
171171

172172
# start new request to GFBIO-API
173173
# https://data.bioontology.org/ontologies/NCBITAXON/classes/http%3A%2F%2Fpurl.bioontology.org%2Fontology%2FNCBITAXON%2F10239/children
174-
console.log "that", that
175-
console.log "that.endpointurl", that.opts.endpointurl
176174
url = that.opts.endpointurl + '/ontologies/' + @_vocParameter + '/classes/' + encodeURIComponent(@_uri) + '/children?apikey=' + that.opts.apikey + '&include=hasChildren,prefLabel&pagesize=100'
177175
getChildren_xhr ={ "xhr" : undefined }
178176
getChildren_xhr.xhr = new (CUI.XHR)(url: url)
@@ -293,6 +291,10 @@ class GFBIO_ListViewTreeNode extends CUI.ListViewTreeNode
293291
if that._gfbio_opts?.callFromExpertSearch == true
294292
CustomDataTypeGFBIO.prototype.__chooseExpertHierarchicalSearchMode(that._cdata, that._editor_layout, resultJSON, that._editor_layout, that._gfbio_opts)
295293

294+
# add custom mask settings to opts
295+
if that?._context?.FieldSchema?.custom_settings
296+
that._gfbio_opts.custom_settings = that._context.FieldSchema.custom_settings
297+
296298
# update form
297299
CustomDataTypeGFBIO.prototype.__updateResult(that._cdata, that._editor_layout, that._gfbio_opts)
298300
# hide popover

0 commit comments

Comments
 (0)