s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2169 from fsteeg/2168-suggest

Browse Source 
Set suggestOptions.type to the selected reconciliation type
This commit is contained in:
Antonin Delpeuch 2019-10-10 17:10:43 +01:00 committed by GitHub
commit 1c2ac45dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/webapp/modules/core/scripts/reconciliation/standard-service-panel.js
View File

@ -246,7 +246,7 @@ ReconStandardServicePanel.prototype._rewirePropertySuggests = function(type) {
suggestOptions.key = null; suggestOptions.key = null;
suggestOptions.query_param_name = "prefix"; suggestOptions.query_param_name = "prefix";
if (type) { if (type) {
suggestOptions.ac_param = { schema: typeof type == "string" ? type : type.id }; suggestOptions.type = typeof type == "string" ? type : type.id;
} }
inputs.suggestP(suggestOptions); inputs.suggestP(suggestOptions);
} }

8
main/webapp/modules/core/scripts/util/custom-suggest.js
View File

@ -91,13 +91,6 @@ var CustomSuggest = {};
var originalSuggestP = $.suggest.suggestP; var originalSuggestP = $.suggest.suggestP;
$.suggest.suggestP = function(input, options) { $.suggest.suggestP = function(input, options) {
originalSuggestP.call(this, input, options); originalSuggestP.call(this, input, options);
if ("ac_param" in options) {
var ac_param = options.ac_param;
if ("schema" in ac_param) {
this.options.ac_param.schema = ac_param.schema;
}
}
}; };
$.suggest.suggestP.prototype = originalSuggestP.prototype; $.suggest.suggestP.prototype = originalSuggestP.prototype;
@ -109,7 +102,6 @@ var CustomSuggest = {};
{}, {},
$.suggest.suggest.defaults, { $.suggest.suggest.defaults, {
scoring: "schema", scoring: "schema",
type: "/type/property",
css: { pane: "fbs-pane fbs-pane-property" } css: { pane: "fbs-pane fbs-pane-property" }
} }
) )