[pgAdmin4][Patch]: To fix the issues in Explain module
Hi,
PFA patch to fix the following issues,
1) Node label alignment issue in Sub-plans if the database object has long
name.
RM#2843
2) Node label not displaying properly if the database object has long name.
RM#2842
3) Node label was incorrect if we run "Explain Analyze" on a query that
invokes a function.
RM#2824
Please review.
--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
diff --git a/web/pgadmin/misc/static/explain/js/explain.js
b/web/pgadmin/misc/static/explain/js/explain.js
index 9eeaa70..d9dc7f5 100644
--- a/web/pgadmin/misc/static/explain/js/explain.js
+++ b/web/pgadmin/misc/static/explain/js/explain.js
@@ -64,7 +64,7 @@ Snap.plugin(function (Snap, Element, Paper, glob) {
);
if (curr_line) {
-lines = lines.slice(0, lines.length - 2);
+lines = lines.slice(0, lines.length - 1);
}
lines = lines.concat(tmpArr);
curr_line = lines[lines.length - 1];
@@ -376,9 +376,10 @@ var PlanModel = Backbone.Model.extend({
if (isSubPlan) {
g.rect(
currentXpos - this.get('width') + pWIDTH + xMargin,
-currentYpos - yMargin,
+currentYpos - this.get('height') + pHEIGHT + yMargin - TXT_ALLIGN,
this.get('width') - xMargin,
-this.get('height'), 5
+this.get('height') + (currentYpos - yMargin),
+5
).attr({
stroke: '#44',
'strokeWidth': 1.2,
@@ -461,7 +462,7 @@ var PlanModel = Backbone.Model.extend({
this.get('Schema')+"."+this.get('image_text'));
var label = g.g();
g.multitext(
- currentXpos + (pWIDTH / 2),
+ currentXpos + (pWIDTH / 2) + TXT_ALLIGN,
currentYpos + pHEIGHT - TXT_ALLIGN,
node_label,
150,
@@ -531,7 +532,7 @@ var MainPlanModel = Backbone.Model.extend({
data['xpos'] = 0;
data['ypos'] = 0;
data['width'] = plan.get('width') + (xMargin * 2);
- data['height'] = plan.get('height') + (yMargin * 2);
+ data['height'] = plan.get('height') + (yMargin * 4);
delete data['Plan'];
}
Re: [pgAdmin4][Patch]: To fix the issues in Explain module
Hi,
Please disregard previous patch, here is the correct patch.
On Mon, Nov 6, 2017 at 3:04 PM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:
> Hi,
>
> PFA patch to fix the following issues,
>
> 1) Node label alignment issue in Sub-plans if the database object has long
> name.
> RM#2843
>
> 2) Node label not displaying properly if the database object has long name.
> RM#2842
>
> 3) Node label was incorrect if we run "Explain Analyze" on a query that
> invokes a function.
> RM#2824
>
> Please review.
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>
diff --git a/web/pgadmin/misc/static/explain/js/explain.js
b/web/pgadmin/misc/static/explain/js/explain.js
index 9eeaa70..90320c7 100644
--- a/web/pgadmin/misc/static/explain/js/explain.js
+++ b/web/pgadmin/misc/static/explain/js/explain.js
@@ -64,7 +64,7 @@ Snap.plugin(function (Snap, Element, Paper, glob) {
);
if (curr_line) {
-lines = lines.slice(0, lines.length - 2);
+lines = lines.slice(0, lines.length - 1);
}
lines = lines.concat(tmpArr);
curr_line = lines[lines.length - 1];
@@ -376,9 +376,10 @@ var PlanModel = Backbone.Model.extend({
if (isSubPlan) {
g.rect(
currentXpos - this.get('width') + pWIDTH + xMargin,
-currentYpos - yMargin,
+currentYpos - this.get('height') + pHEIGHT + yMargin - TXT_ALLIGN,
this.get('width') - xMargin,
-this.get('height'), 5
+(this.get('width') - xMargin) / 2,
+5
).attr({
stroke: '#44',
'strokeWidth': 1.2,
@@ -461,7 +462,7 @@ var PlanModel = Backbone.Model.extend({
this.get('Schema')+"."+this.get('image_text'));
var label = g.g();
g.multitext(
- currentXpos + (pWIDTH / 2),
+ currentXpos + (pWIDTH / 2) + TXT_ALLIGN,
currentYpos + pHEIGHT - TXT_ALLIGN,
node_label,
150,
@@ -531,7 +532,7 @@ var MainPlanModel = Backbone.Model.extend({
data['xpos'] = 0;
data['ypos'] = 0;
data['width'] = plan.get('width') + (xMargin * 2);
- data['height'] = plan.get('height') + (yMargin * 2);
+ data['height'] = plan.get('height') + (yMargin * 4);
delete data['Plan'];
}
Re: Fixes for pgAdmin4 messages
Hello, 05.11.2017 16:36, Dave Page wrote: That looks like it - thanks, applied! Thank you! And another one. (I've processed onText/offText instances, alertify.* calls and depends.js) Please look at it. -- Alexander Lakhin Postgres Professional: http://www.postgrespro.com The Russian Postgres Company
Re: Fixes for pgAdmin4 messages
Hello,
05.11.2017 16:36, Dave Page wrote:
That looks like it - thanks, applied!
Thank you!
And another one.
(I've processed onText/offText instances, alertify.* calls and depends.js)
Please look at it.
--
Alexander Lakhin
Postgres Professional: http://www.postgrespro.com
The Russian Postgres Company
diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
index 09868dc2..2d5fb295 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
@@ -257,7 +257,7 @@ define('pgadmin.node.cast', [
id: 'syscast', label: gettext('System cast?'),
cell: 'switch', type: 'switch', mode: ['properties'], disabled: true,
options: {
-'onText': 'Yes', 'offText': 'No',
+'onText': gettext('Yes'), 'offText': gettext('No'),
'onColor': 'success', 'offColor': 'primary',
'size': 'small'
}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js
index 1d80..9f59cc3d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js
@@ -194,7 +194,7 @@ define('pgadmin.node.extension', [
id: 'relocatable', label: gettext('Relocatable?'), cell: 'switch',
group: gettext('Definition'), type: 'switch', mode: ['properties'],
options: {
- 'onText': 'Yes', 'offText': 'No',
+ 'onText': gettext('Yes'), 'offText': gettext('No'),
'onColor': 'success', 'offColor': 'primary',
'size': 'small'
}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
index 67ed92c9..5bc53826 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
@@ -126,7 +126,7 @@ define('pgadmin.node.language', [
},{
id: 'trusted', label: gettext('Trusted?'), type: 'switch',
options: {
-'onText': 'Yes', 'offText': 'No',
+'onText': gettext('Yes'), 'offText': gettext('No'),
'onColor': 'success', 'offColor': 'primary',
'size': 'small'
},
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
index af205504..3f6678b1 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
@@ -167,7 +167,7 @@ define('pgadmin.node.domain', [
id: 'sysdomain', label: gettext('System domain?'), cell: 'boolean',
type: 'switch', mode: ['properties'],
options: {
-'onText': 'Yes', 'offText': 'No',
+'onText': gettext('Yes'), 'offText': gettext('No'),
'onColor': 'success', 'offColor': 'primary',
'size': 'small'
}
@@ -246,7 +246,7 @@ define('pgadmin.node.domain', [
id: 'typnotnull', label: gettext('Not Null?'), cell: 'boolean',
type: 'switch', group: gettext('Definition'),
options: {
-'onText': 'Yes', 'offText': 'No',
+'onText': gettext('Yes'), 'offText': gettext('No'),
'onColor': 'success', 'offColor': 'primary',
'size': 'small'
}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
index e415e8c4..bd3ad137 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
@@ -265,7 +265,7 @@ define('pgadmin.node.function', [
id: 'proisstrict', label: gettext('Strict?'), type: 'switch',
group: gettext('Options'), disabled: 'isDisabled',
options: {
-'onText': 'Yes', 'offText': 'No',
+'onText': gettext('Yes'), 'offText': gettext('No'),
'onColor': 'success', 'offColor': 'primary',
'size': 'small'
}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas
Re: Fixes for pgAdmin4 messages
Hi I think you forgot to attach the patch. Thanks, Dave On Mon, Nov 6, 2017 at 9:00 AM, Alexander Lakhin wrote: > Hello, > > 05.11.2017 16:36, Dave Page wrote: > > That looks like it - thanks, applied! > > Thank you! > > And another one. > (I've processed onText/offText instances, alertify.* calls and depends.js) > Please look at it. > > -- > Alexander Lakhin > Postgres Professional: http://www.postgrespro.com > The Russian Postgres Company > > -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
pgAdmin 4 commit: Further missing translation fixes. Stats now:
Further missing translation fixes. Stats now: 1481 of 1831 messages (80%) translated in pgadmin/translations/de/LC_MESSAGES/messages.po 1694 of 1831 messages (92%) translated in pgadmin/translations/ja/LC_MESSAGES/messages.po 1748 of 1831 messages (95%) translated in pgadmin/translations/pl/LC_MESSAGES/messages.po 1750 of 1831 messages (95%) translated in pgadmin/translations/ru/LC_MESSAGES/messages.po 1436 of 1831 messages (78%) translated in pgadmin/translations/zh/LC_MESSAGES/messages.po Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=187ab22d907292e794f5630a39cbc30d7619ccb5 Author: Alexander Lakhin Modified Files -- .../servers/databases/casts/static/js/cast.js | 2 +- .../databases/extensions/static/js/extension.js| 2 +- .../databases/languages/static/js/language.js | 2 +- .../databases/schemas/domains/static/js/domain.js | 4 +- .../schemas/functions/static/js/function.js| 2 +- .../functions/static/js/trigger_function.js| 2 +- .../schemas/sequences/static/js/sequence.js| 2 +- .../schemas/synonyms/static/js/synonym.js | 2 +- .../schemas/tables/column/static/js/column.js | 2 +- .../tables/partitions/static/js/partition.js | 4 +- .../schemas/tables/static/js/partition.utils.js| 2 +- .../databases/schemas/tables/static/js/table.js| 4 +- .../databases/schemas/views/static/js/mview.js | 6 +- .../servers/databases/static/js/database.js| 2 +- .../server_groups/servers/roles/static/js/role.js | 2 +- .../server_groups/servers/static/js/server.js | 6 +- web/pgadmin/browser/static/js/node.js | 4 +- web/pgadmin/messages.pot | 414 ++- web/pgadmin/misc/depends/static/js/depends.js | 14 +- web/pgadmin/static/js/backform.pgadmin.js | 4 +- web/pgadmin/static/js/backgrid.pgadmin.js | 8 +- web/pgadmin/tools/datagrid/static/js/datagrid.js | 18 +- web/pgadmin/tools/debugger/static/js/debugger.js | 4 +- .../tools/debugger/static/js/debugger_ui.js| 10 +- web/pgadmin/tools/debugger/static/js/direct.js | 128 ++-- web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 70 +- .../user_management/static/js/user_management.js | 8 +- .../translations/de/LC_MESSAGES/messages.mo| Bin 127638 -> 132000 bytes .../translations/de/LC_MESSAGES/messages.po| 414 ++- .../translations/ja/LC_MESSAGES/messages.mo| Bin 137022 -> 141384 bytes .../translations/ja/LC_MESSAGES/messages.po| 414 ++- .../translations/pl/LC_MESSAGES/messages.mo| Bin 126626 -> 131960 bytes .../translations/pl/LC_MESSAGES/messages.po| 800 - .../translations/ru/LC_MESSAGES/messages.mo| Bin 165353 -> 169715 bytes .../translations/ru/LC_MESSAGES/messages.po| 414 ++- .../translations/zh/LC_MESSAGES/messages.mo| Bin 104251 -> 108613 bytes .../translations/zh/LC_MESSAGES/messages.po| 414 ++- 37 files changed, 2676 insertions(+), 508 deletions(-)
Re: Fixes for pgAdmin4 messages
Thanks, applied with some wording tweaks. On Mon, Nov 6, 2017 at 9:13 AM, Alexander Lakhin wrote: > Hello, > > 05.11.2017 16:36, Dave Page wrote: > > That looks like it - thanks, applied! > > Thank you! > > And another one. > (I've processed onText/offText instances, alertify.* calls and depends.js) > Please look at it. > > -- > Alexander Lakhin > Postgres Professional: http://www.postgrespro.com > The Russian Postgres Company > > -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
Re: [pgAdmin4][Patch]: To fix the issues in Explain module
Thanks, applied! On Mon, Nov 6, 2017 at 4:42 AM, Murtuza Zabuawala < murtuza.zabuaw...@enterprisedb.com> wrote: > Hi, > > Please disregard previous patch, here is the correct patch. > > > On Mon, Nov 6, 2017 at 3:04 PM, Murtuza Zabuawala enterprisedb.com> wrote: > >> Hi, >> >> PFA patch to fix the following issues, >> >> 1) Node label alignment issue in Sub-plans if the database object has >> long name. >> RM#2843 >> >> 2) Node label not displaying properly if the database object has long >> name. >> RM#2842 >> >> 3) Node label was incorrect if we run "Explain Analyze" on a query that >> invokes a function. >> RM#2824 >> >> Please review. >> >> -- >> Regards, >> Murtuza Zabuawala >> EnterpriseDB: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> >> > -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
pgAdmin 4 commit: Fix a number of graphical explain rendering issues. F
Fix a number of graphical explain rendering issues. Fixes #2824. Fixes #2842. Fixes #2843. Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=8b543a58fe516ed0a35a22b1dad57eef93e52c98 Author: Murtuza Zabuawala Modified Files -- web/pgadmin/misc/static/explain/js/explain.js | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-)
[pgAdmin4][patch][runtime]: RM#2443 - No prompt while exiting application
Hi, Please find attached patch to fix RM#2443 - No prompt while existing from main pgAdmin4 runtime browser window. Do review it and let me know for comments. Thanks, Neel Patel RM_2443.patch Description: Binary data
