diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py index 221681578..54467ee0f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py @@ -20,6 +20,7 @@ from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver from config import PG_DEFAULT_DRIVER from functools import wraps +from pgadmin.utils.preferences import Preferences class CatalogObjectColumnsModule(CollectionNodeModule): @@ -80,6 +81,17 @@ class CatalogObjectColumnsModule(CollectionNodeModule): """ return False + def register_preferences(self): + """ + Register preferences for this module. + """ + # Add the node informaton for browser, not in respective + # node preferences + self.browser_preference = Preferences.module('browser') + self.pref_show_system_objects = self.browser_preference.preference( + 'show_system_objects' + ) + blueprint = CatalogObjectColumnsModule(__name__) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py index 95c833117..5a68442ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py @@ -1463,7 +1463,7 @@ class TriggerFunctionModule(SchemaChildModule): """ NODE_TYPE = 'trigger_function' - COLLECTION_LABEL = gettext("Trigger function") + COLLECTION_LABEL = gettext("Trigger Function") def __init__(self, *args, **kwargs): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py index 8b194c1cc..16eafc191 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py @@ -47,7 +47,7 @@ class ExclusionConstraintModule(ConstraintTypeModule): """ NODE_TYPE = 'exclusion_constraint' - COLLECTION_LABEL = _("Foreign Keys") + COLLECTION_LABEL = _("Exclusion Constraints") def __init__(self, *args, **kwargs): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py index 212f88f36..90aa4ce20 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py @@ -98,7 +98,7 @@ class PrimaryKeyConstraintModule(IndexConstraintModule): """ NODE_TYPE = 'primary_key' - COLLECTION_LABEL = _("Primary key") + COLLECTION_LABEL = _("Primary Key") primary_key_blueprint = PrimaryKeyConstraintModule(__name__) @@ -112,7 +112,7 @@ class UniqueConstraintModule(IndexConstraintModule): """ NODE_TYPE = 'unique_constraint' - COLLECTION_LABEL = _("Unique constraint") + COLLECTION_LABEL = _("Unique Constraint") unique_constraint_blueprint = UniqueConstraintModule(__name__) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js index 4ea249dd1..e8db294f8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js @@ -561,7 +561,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) { canAdd: true, columns : ['name', 'consrc'] },{ - id: 'unique_constraint', label: '{{ _('Unique constraint') }}', + id: 'unique_constraint', label: '{{ _('Unique Constraint') }}', model: pgBrowser.Nodes['unique_constraint'].model, subnode: pgBrowser.Nodes['unique_constraint'].model, editable: false, type: 'collection', diff --git a/web/pgadmin/preferences/templates/preferences/preferences.js b/web/pgadmin/preferences/templates/preferences/preferences.js index 38a26ef2d..69053b3d2 100644 --- a/web/pgadmin/preferences/templates/preferences/preferences.js +++ b/web/pgadmin/preferences/templates/preferences/preferences.js @@ -364,7 +364,8 @@ define( options: { padding: !1, overflow: !1, - title: '{{ _('Preferences')|safe }}' + title: '{{ _('Preferences')|safe }}', + closableByDimmer: false } }; },