From 88a1e03314759b4b7d5a3fb91095e4fd47939c14 Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Wed, 1 Apr 2020 15:03:30 +0530 Subject: [PATCH] =?UTF-8?q?Fixed=20generated=20SQL=20when=C2=A0any=20token?= =?UTF-8?q?=20in=20FTS=20Configuration=20or=20any=20option=20in=20FTS=20Di?= =?UTF-8?q?ctionary=20is=20changed.=20Fixes=20#5268?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/en_US/release_notes_4_21.rst | 3 ++- .../schemas/fts_configurations/static/js/fts_configuration.js | 1 + .../schemas/fts_dictionaries/static/js/fts_dictionary.js | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/en_US/release_notes_4_21.rst b/docs/en_US/release_notes_4_21.rst index 3e12cbde0..ba3457170 100644 --- a/docs/en_US/release_notes_4_21.rst +++ b/docs/en_US/release_notes_4_21.rst @@ -17,4 +17,5 @@ Housekeeping Bug fixes ********* -| `Issue #3645 `_ - Ensure that the start and end date should be deleted when clear the selection for pgAgent Job. \ No newline at end of file +| `Issue #3645 `_ - Ensure that the start and end date should be deleted when clear the selection for pgAgent Job. +| `Issue #5268 `_ - Fixed generated SQL when any token in FTS Configuration or any option in FTS Dictionary is changed. \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js index ab4838ea5..ba13f498a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js @@ -19,6 +19,7 @@ define('pgadmin.node.fts_configuration', [ // Model for tokens control var TokenModel = pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'token', defaults: { token: undefined, dictname: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js index 91f1d23fa..08666e80c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js @@ -19,8 +19,9 @@ define('pgadmin.node.fts_dictionary', [ // Extend the browser's node model class to create a option/value pair var OptionLabelModel = pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'option', defaults: { - options: undefined, + option: undefined, value: undefined, }, // Define the schema for the Options