From 5ce27736589d164aac8cea26286ca3a9a1492b2f Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Tue, 4 Aug 2020 15:48:20 +0530
Subject: [PATCH] Ensure that the Dictionaries drop-down shows all the
 dictionaries in the FTS configuration dialog. Fixes #5429

---
 docs/en_US/release_notes_4_25.rst                             | 1 +
 .../schemas/fts_configurations/static/js/fts_configuration.js | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/docs/en_US/release_notes_4_25.rst b/docs/en_US/release_notes_4_25.rst
index 9e03e18cf..f41e554a7 100644
--- a/docs/en_US/release_notes_4_25.rst
+++ b/docs/en_US/release_notes_4_25.rst
@@ -25,6 +25,7 @@ Bug fixes
 
 | `Issue #3767 <https://redmine.postgresql.org/issues/3767>`_ -  Ensure that the original file format should be retained when saving the same file in SQL editor.
 | `Issue #4810 <https://redmine.postgresql.org/issues/4810>`_ -  Fixed an issue where the user is not able to save the new row if the table is empty.
+| `Issue #5429 <https://redmine.postgresql.org/issues/5429>`_ -  Ensure that the Dictionaries drop-down shows all the dictionaries in the FTS configuration dialog.
 | `Issue #5490 <https://redmine.postgresql.org/issues/5490>`_ -  Make the runtime configuration dialog non-modal.
 | `Issue #5632 <https://redmine.postgresql.org/issues/5632>`_ -  Ensure that the user will be able to modify the start value of the Identity column.
 | `Issue #5646 <https://redmine.postgresql.org/issues/5646>`_ -  Ensure that RLS Policy node should be searchable using search object.
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 2cd9d997a..6af380e12 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
@@ -34,6 +34,7 @@ define('pgadmin.node.fts_configuration', [
       id: 'dictname', label: gettext('Dictionaries'), type: 'text', group:null,
       cellHeaderClasses:'width_percent_50', editable: true,
       cell:Backgrid.Extension.MultiSelectAjaxCell, url: 'dictionaries',
+      cache_level:'fts_configuration', cache_node:'fts_configuration',
     }],
     // Validation for token and dictionary list
     validate: function() {
@@ -108,6 +109,9 @@ define('pgadmin.node.fts_configuration', [
                                     pgAdmin.Browser.Nodes[cache_node])
                                || node;
 
+                  // Clear the cache to get the latest dictionaries and parsers.
+                  cache_node.clear_cache(this);
+
                   /*
                    * We needs to check, if we have already cached data
                    * for this url. If yes - use it, and do not bother about