public inbox for [email protected]
help / color / mirror / Atom feedFrom: Harshal Dhumal <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: Minor issues
Date: Fri, 29 Apr 2016 11:52:19 +0530
Message-ID: <CAFiP3vw+iPN1D01PFdJ3Xnh6pKz+ooUo_4Cu0PqHnDXvCWX1uA@mail.gmail.com> (raw)
List-Unsubscribe: <mailto:[email protected]?body=unsub%20pgadmin-hackers>
Hi,
PFA patch for minor issues.
Issues fixed:
1] Removed unwanted "{% if %}" from database 9.1 nodes.sql
2] Fixed issue while removing select2cell fro backgrid.
--
*Harshal Dhumal*
*Software Engineer *
EenterpriseDB <http://www.enterprisedb.com;
--
Sent via pgadmin-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
Attachments:
[text/x-patch] minor_issues_29_April.patch (1.4K, 3-minor_issues_29_April.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/nodes.sql
index 3ce9645..b05880c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/nodes.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/nodes.sql
@@ -3,7 +3,7 @@ SELECT
has_database_privilege(db.oid, 'CREATE') as cancreate, datdba as owner
FROM
pg_database db
- LEFT OUTER JOIN pg_tablespace ta ON db.dattablespace = ta.oid{% if did %}
+ LEFT OUTER JOIN pg_tablespace ta ON db.dattablespace = ta.oid
WHERE {% if did %}
db.oid = {{ did|qtLiteral }}::OID{% else %}
db.oid > {{ last_system_oid }}::OID
diff --git a/web/pgadmin/static/js/backgrid/backgrid.pgadmin.js b/web/pgadmin/static/js/backgrid/backgrid.pgadmin.js
index 999ac7c..5311a01 100644
--- a/web/pgadmin/static/js/backgrid/backgrid.pgadmin.js
+++ b/web/pgadmin/static/js/backgrid/backgrid.pgadmin.js
@@ -530,7 +530,9 @@
remove: function() {
this.$select.off('change', this.onSave);
- this.$select.select2('destroy');
+ if (this.$select.data('select2')) {
+ this.$select.select2('destroy');
+ }
this.$el.empty();
Backgrid.SelectCell.prototype.remove.apply(this, arguments);
}
view thread (3+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected]
Subject: Re: Minor issues
In-Reply-To: <CAFiP3vw+iPN1D01PFdJ3Xnh6pKz+ooUo_4Cu0PqHnDXvCWX1uA@mail.gmail.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox