Preferences dialogue. Patch by Ashesh and Khushboo Vashi.

web/pgadmin/browser/server_groups/servers/__init__.py

@@ -8,25 +8,22 @@
 ##########################################################################
 
 import json
-from abc import ABCMeta, abstractproperty
 from flask import render_template, request, make_response, jsonify, \
         current_app, url_for
-from flask.ext.security import login_required, current_user
-from pgadmin.settings.settings_model import db, Server, ServerGroup, User
+from flask.ext.security import current_user
+from pgadmin.model import db, Server, ServerGroup, User
 from pgadmin.utils.menu import MenuItem
-from pgadmin.utils.ajax import make_json_response, \
-    make_response as ajax_response, internal_server_error, success_return, \
-    unauthorized, bad_request, precondition_required, forbidden
+from pgadmin.utils.ajax import make_json_response, bad_request, forbidden, \
+    make_response as ajax_response, internal_server_error, unauthorized
 from pgadmin.browser.utils import PGChildNodeView
 import traceback
 from flask.ext.babel import gettext
 import pgadmin.browser.server_groups as sg
 from pgadmin.utils.crypto import encrypt
-from pgadmin.browser import BrowserPluginModule
 from config import PG_DEFAULT_DRIVER
-import six
 from pgadmin.browser.server_groups.servers.types import ServerType
 
+
 def has_any(data, keys):
     """
     Checks any one of the keys present in the data given
@@ -46,6 +43,7 @@ def has_any(data, keys):
 
 class ServerModule(sg.ServerGroupPluginModule):
     NODE_TYPE = "server"
+    LABEL = gettext("Servers")
 
     @property
     def node_type(self):
@@ -146,6 +144,15 @@ class ServerModule(sg.ServerGroupPluginModule):
 
         super(ServerModule, self).register(app, options, first_registration)
 
+    # We do not have any preferences for server node.
+    def register_preferences(self):
+        """
+        register_preferences
+        Override it so that - it does not register the show_node preference for
+        server type.
+        """
+        pass
+
 class ServerMenuItem(MenuItem):
     def __init__(self, **kwargs):
         kwargs.setdefault("type", ServerModule.NODE_TYPE)

web/pgadmin/browser/server_groups/servers/databases/__init__.py

@@ -41,7 +41,8 @@ class DatabaseModule(CollectionNodeModule):
         """
         Generate the collection node
         """
-        yield self.generate_browser_collection_node(sid)
+        if self.show_node:
+            yield self.generate_browser_collection_node(sid)
 
     @property
     def script_load(self):
@@ -634,7 +635,7 @@ class DatabaseView(PGChildNodeView):
         except Exception as e:
             current_app.logger.exception(e)
             return make_json_response(
-                    data="-- modified SQL",
+                    data=_("-- modified SQL"),
                     status=200
                     )
 

web/pgadmin/browser/server_groups/servers/roles/__init__.py

@@ -10,8 +10,7 @@ from flask import render_template, request, jsonify, current_app
 from flask.ext.babel import gettext as _
 from pgadmin.utils.ajax import make_json_response, \
     make_response as ajax_response, precondition_required, \
-    internal_server_error, forbidden, \
-    not_implemented, success_return, gone
+    internal_server_error, forbidden, success_return, gone
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.browser.collection import CollectionNodeModule
 import pgadmin.browser.server_groups as sg
@@ -37,8 +36,9 @@ class RoleModule(CollectionNodeModule):
         """
         Generate the collection node
         """
-
-        yield self.generate_browser_collection_node(sid)
+        if self.show_node:
+            yield self.generate_browser_collection_node(sid)
+        pass
 
     @property
     def node_inode(self):
@@ -480,7 +480,8 @@ rolmembership:{
                 if check_permission:
                     user = self.manager.user_info
 
-                    if not user['is_superuser'] and not user['can_create_role']:
+                    if not user['is_superuser'] and \
+                            not user['can_create_role']:
                         if (action != 'update' or
                                 'rid' in kwargs and kwargs['rid'] != -1 and
                                 user['id'] != kwargs['rid']):

web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py

@@ -26,12 +26,6 @@ class TablespaceModule(CollectionNodeModule):
     NODE_TYPE = 'tablespace'
     COLLECTION_LABEL = gettext("Tablespaces")
 
-    def __init__(self, *args, **kwargs):
-        self.min_ver = None
-        self.max_ver = None
-
-        super(TablespaceModule, self).__init__(*args, **kwargs)
-
     def get_nodes(self, gid, sid):
         """
         Generate the collection node