Fix various inconsistencies with databases and tablespaces:

- Display the ACL string in properties, not the subnode panel.
- Offer default values for the owner of new objects.
- Add missing context menu option to create a tablespace from a server node.

web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js

@@ -205,6 +205,18 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
           defseqacl: [],
           deftypeacl: []
         },
+
+        // Default values!
+        initialize: function(attrs, args) {
+          var isNew = (_.size(attrs) === 0);
+
+          if (isNew) {
+            var userInfo = pgBrowser.serverInfo[args.node_info.server._id].user;
+            this.set({'datowner': userInfo.name}, {silent: true});
+          }
+          pgAdmin.Browser.Node.Model.prototype.initialize.apply(this, arguments);
+        },
+
         schema: [{
           id: 'name', label: '{{ _('Database') }}', cell: 'string',
           editable: false, type: 'text'

web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js

@@ -57,6 +57,11 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         this.initialized = true;
 
         pgBrowser.add_menus([{
+          name: 'create_tablespace_on_server', node: 'server', module: this,
+          applies: ['object', 'context'], callback: 'show_obj_properties',
+          category: 'create', priority: 4, label: '{{ _('Tablespace...') }}',
+          icon: 'wcTabIcon icon-tablespace', data: {action: 'create'}
+        },{
           name: 'create_tablespace_on_coll', node: 'coll-tablespace', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
           category: 'create', priority: 4, label: '{{ _('Tablespace...') }}',
@@ -79,6 +84,18 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
           spcacl: [],
           seclabels:[]
         },
+
+        // Default values!
+        initialize: function(attrs, args) {
+          var isNew = (_.size(attrs) === 0);
+
+          if (isNew) {
+            var userInfo = pgBrowser.serverInfo[args.node_info.server._id].user;
+            this.set({'spcuser': userInfo.name}, {silent: true});
+          }
+          pgAdmin.Browser.Node.Model.prototype.initialize.apply(this, arguments);
+        },
+
         schema: [{
           id: 'name', label: '{{ _('Name') }}', cell: 'string',
           type: 'text'
@@ -96,6 +113,9 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         },{
           id: 'spcuser', label:'{{ _('Owner') }}', cell: 'string',
           type: 'text', control: 'node-list-by-name', node: 'role'
+        },{
+          id: 'acl', label: '{{ _('Privileges') }}', type: 'text',
+          mode: ['properties'], disabled: true
         },{
           id: 'description', label:'{{ _('Comment') }}', cell: 'string',
           type: 'multiline'
@@ -109,7 +129,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
           id: 'spcacl', label: 'Privileges', type: 'collection',
           group: '{{ _('Security') }}', control: 'unique-col-collection',
           model: pgAdmin.Browser.Node.PrivilegeRoleModel.extend({privileges: ['C']}),
-          mode: ['properties', 'edit', 'create'], canAdd: true, canDelete: true,
+          mode: ['edit', 'create'], canAdd: true, canDelete: true,
           uniqueCol : ['grantee'],
           columns: ['grantee', 'grantor', 'privileges']
          },{

web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/sql/9.1_plus/properties.sql

@@ -2,7 +2,8 @@
 SELECT
     ts.oid, spcname AS name, spclocation, spcoptions,
     pg_get_userbyid(spcowner) as spcuser, spcacl,
-    pg_catalog.shobj_description(oid, 'pg_tablespace') AS description
+    pg_catalog.shobj_description(oid, 'pg_tablespace') AS description,
+    spcacl as acl
 FROM
     pg_tablespace ts
 {% if tsid %}

web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/sql/9.2_plus/properties.sql

@@ -6,7 +6,8 @@ SELECT
     (SELECT
         array_agg(provider || '=' || label)
     FROM pg_shseclabel sl1
-    WHERE sl1.objoid=ts.oid) AS seclabels
+    WHERE sl1.objoid=ts.oid) AS seclabels,
+    spcacl as acl
 FROM
     pg_tablespace ts
 {% if tsid %}

web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/sql/pre_9.1/properties.sql

@@ -1,5 +1,5 @@
 {### SQL to fetch tablespace object properties ###}
-SELECT ts.oid, spcname AS name, spclocation, spcoptions, pg_get_userbyid(spcowner) as spcuser, spcacl,
+SELECT ts.oid, spcname AS name, spclocation, spcoptions, pg_get_userbyid(spcowner) as spcuser, spcacl, spcacl as acl
 pg_catalog.shobj_description(oid, 'pg_tablespace') AS description
 FROM pg_tablespace ts
 {% if tsid %}