Re: [pgAdmin4][Patch] - RM 3900 - Delete/Drop option is disabled for the constraints
Hello, I'm reviewing this RM. On Wed, Apr 22, 2020 at 10:55 AM Khushboo Vashi < khushboo.va...@enterprisedb.com> wrote: > Hi, > > Please find the attached patch to fix the RM #3900 - Delete/Drop option > is disabled for the constraints. > > - Implemented multiple drop/delete functionality for the Table constraints. > > Thanks, > Khushboo > -- Regards, Navnath Gadakh
pgAdmin 4 commit: Fixed an issue where [null] and [default] values are
Fixed an issue where [null] and [default] values are not get copied. Part of #3947 Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=b29bc6868c074511b3fa91089213abd31be03b2b Author: Nagesh Dhope Modified Files -- web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 9 + 1 file changed, 9 insertions(+)
pgAdmin 4 commit: 1) Fixed feature test and API test cases.
1) Fixed feature test and API test cases. 2) Added logic to exclude RESQL test cases. Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=4c616f32eb5afe9afdf56a9cd584f7798266c085 Modified Files -- .../servers/pgagent/templates/macros/pga_schedule.macros| 2 +- web/pgadmin/feature_tests/test_data.json| 3 ++- web/pgadmin/utils/route.py | 6 -- web/regression/README | 3 +++ web/regression/feature_utils/pgadmin_page.py| 2 +- 5 files changed, 11 insertions(+), 5 deletions(-)
Re: Exclude RESQL test cases
Thanks, patch applied. On Wed, Apr 22, 2020 at 11:32 AM navnath gadakh < navnath.gad...@enterprisedb.com> wrote: > Hello Hackers, > > Please review the small patch to exclude RESQL test cases. > resql param is added to --exclude. > > Thanks! > > -- > Regards, > Navnath Gadakh > -- *Thanks & Regards* *Akshay Joshi* *Sr. Software Architect* *EnterpriseDB Software India Private Limited* *Mobile: +91 976-788-8246*
Re: [pgAdmin][RM3947] Fixes related rows copy-paste in Query Tool.
Thanks, patch applied. On Wed, Apr 22, 2020 at 10:09 AM Nagesh Dhope wrote: > Hi, > Please find a patch, which will allow copying *[null]* and *[default] > cell values.* > -- *Thanks & Regards* *Akshay Joshi* *Sr. Software Architect* *EnterpriseDB Software India Private Limited* *Mobile: +91 976-788-8246*
Re: [pgAdmin][RM5352] : Rightmost & Bottom tooltip crop issues in Explain Query Plan
Hi Hackers,
Here is an updated patch which solves the problem of more large query which
deals fine with zoom factor as well .
FYI: During testing it was found that the previous patch was only working
for mid sized query and not more large complex query due to zoom factor
issue.
Please review the new patch.
PFA.
On Tue, Apr 21, 2020 at 1:32 PM Akshay Joshi
wrote:
> Thanks, patch applied.
>
> On Mon, Apr 20, 2020 at 8:05 PM Yogesh Jain
> wrote:
>
>> Hi Hackers,
>>
>> Attached is the patch to fix the rightmost & bottom tooltip crop issues
>> in the explain query plan.
>>
>> FYI : While explaining a large query if we hover the rightmost or bottom
>> icon the tooltip is cropped & partially visible, which is fixed in this
>> patch.
>>
>> Please review.
>> PFA.
>>
>> --
>> Regards,
>> Yogesh Jain
>> 8982696654
>>
>
>
> --
> *Thanks & Regards*
> *Akshay Joshi*
>
> *Sr. Software Architect*
> *EnterpriseDB Software India Private Limited*
> *Mobile: +91 976-788-8246*
>
--
Regards,
Yogesh Jain
8982696654
diff --git a/web/pgadmin/misc/static/explain/js/explain.js b/web/pgadmin/misc/static/explain/js/explain.js
index 21167775d..935f2815e 100644
--- a/web/pgadmin/misc/static/explain/js/explain.js
+++ b/web/pgadmin/misc/static/explain/js/explain.js
@@ -994,8 +994,8 @@ define('pgadmin.misc.explain', [
toolTipX = toolTipX < 0 ? 0 : (toolTipX);
toolTipY = toolTipY < 0 ? 0 : (toolTipY);
-toolTipX = toolTipX > graphContainer.width()-toolTipContainer[0].clientWidth ? graphContainer.width()-(toolTipContainer[0].clientWidth*zoomFactor) : toolTipX;
-toolTipY = toolTipY > graphContainer.height()-toolTipContainer[0].clientHeight ? graphContainer.height()-(toolTipContainer[0].clientWidth*zoomFactor) : toolTipY;
+toolTipX = toolTipX > graphContainer.width() - toolTipContainer[0].clientWidth ? toolTipX - (toolTipContainer[0].clientWidth+(pWIDTH* zoomFactor)) : toolTipX;
+toolTipY = toolTipY > graphContainer.height() - toolTipContainer[0].clientHeight ? graphContainer.height() - toolTipContainer[0].clientHeight : toolTipY;
// Show toolTip at respective x,y coordinates
toolTipContainer.css({
Re: [pgAdmin4][Patch] - RM 3900 - Delete/Drop option is disabled for the constraints
Patch looks good to me. On Wed, Apr 22, 2020 at 1:54 PM navnath gadakh < navnath.gad...@enterprisedb.com> wrote: > Hello, > > I'm reviewing this RM. > > On Wed, Apr 22, 2020 at 10:55 AM Khushboo Vashi < > khushboo.va...@enterprisedb.com> wrote: > >> Hi, >> >> Please find the attached patch to fix the RM #3900 - Delete/Drop option >> is disabled for the constraints. >> >> - Implemented multiple drop/delete functionality for the Table >> constraints. >> >> Thanks, >> Khushboo >> > > > -- > Regards, > Navnath Gadakh > -- Regards, Navnath Gadakh
Re: [pgAdmin][RM5352] : Rightmost & Bottom tooltip crop issues in Explain Query Plan
Hi, I'm reviewing this patch. On Wed, Apr 22, 2020 at 3:09 PM Yogesh Jain wrote: > Hi Hackers, > > Here is an updated patch which solves the problem of more large query > which deals fine with zoom factor as well . > > FYI: During testing it was found that the previous patch was only working > for mid sized query and not more large complex query due to zoom factor > issue. > > Please review the new patch. > PFA. > > On Tue, Apr 21, 2020 at 1:32 PM Akshay Joshi < > akshay.jo...@enterprisedb.com> wrote: > >> Thanks, patch applied. >> >> On Mon, Apr 20, 2020 at 8:05 PM Yogesh Jain >> wrote: >> >>> Hi Hackers, >>> >>> Attached is the patch to fix the rightmost & bottom tooltip crop issues >>> in the explain query plan. >>> >>> FYI : While explaining a large query if we hover the rightmost or bottom >>> icon the tooltip is cropped & partially visible, which is fixed in this >>> patch. >>> >>> Please review. >>> PFA. >>> >>> -- >>> Regards, >>> Yogesh Jain >>> 8982696654 >>> >> >> >> -- >> *Thanks & Regards* >> *Akshay Joshi* >> >> *Sr. Software Architect* >> *EnterpriseDB Software India Private Limited* >> *Mobile: +91 976-788-8246* >> > > > -- > Regards, > Yogesh Jain > 8982696654 > -- Regards, Navnath Gadakh
Re: [pgAdmin][RM5352] : Rightmost & Bottom tooltip crop issues in Explain Query Plan
Patch is committed :). Not pushed On Wed, 22 Apr, 2020, 16:46 navnath gadakh, wrote: > Hi, > > I'm reviewing this patch. > > On Wed, Apr 22, 2020 at 3:09 PM Yogesh Jain > wrote: > >> Hi Hackers, >> >> Here is an updated patch which solves the problem of more large query >> which deals fine with zoom factor as well . >> >> FYI: During testing it was found that the previous patch was only working >> for mid sized query and not more large complex query due to zoom factor >> issue. >> >> Please review the new patch. >> PFA. >> >> On Tue, Apr 21, 2020 at 1:32 PM Akshay Joshi < >> akshay.jo...@enterprisedb.com> wrote: >> >>> Thanks, patch applied. >>> >>> On Mon, Apr 20, 2020 at 8:05 PM Yogesh Jain < >>> yogesh.j...@enterprisedb.com> wrote: >>> Hi Hackers, Attached is the patch to fix the rightmost & bottom tooltip crop issues in the explain query plan. FYI : While explaining a large query if we hover the rightmost or bottom icon the tooltip is cropped & partially visible, which is fixed in this patch. Please review. PFA. -- Regards, Yogesh Jain 8982696654 >>> >>> >>> -- >>> *Thanks & Regards* >>> *Akshay Joshi* >>> >>> *Sr. Software Architect* >>> *EnterpriseDB Software India Private Limited* >>> *Mobile: +91 976-788-8246* >>> >> >> >> -- >> Regards, >> Yogesh Jain >> 8982696654 >> > > > -- > Regards, > Navnath Gadakh >
Re: [pgAdmin][RM5352] : Rightmost & Bottom tooltip crop issues in Explain Query Plan
Please commit the second patch as there is an issue with first one for the zoom factor. On Wed, Apr 22, 2020 at 4:50 PM Akshay Joshi wrote: > Patch is committed :). Not pushed > > On Wed, 22 Apr, 2020, 16:46 navnath gadakh, < > navnath.gad...@enterprisedb.com> wrote: > >> Hi, >> >> I'm reviewing this patch. >> >> On Wed, Apr 22, 2020 at 3:09 PM Yogesh Jain >> wrote: >> >>> Hi Hackers, >>> >>> Here is an updated patch which solves the problem of more large query >>> which deals fine with zoom factor as well . >>> >>> FYI: During testing it was found that the previous patch was only >>> working for mid sized query and not more large complex query due to zoom >>> factor issue. >>> >>> Please review the new patch. >>> PFA. >>> >>> On Tue, Apr 21, 2020 at 1:32 PM Akshay Joshi < >>> akshay.jo...@enterprisedb.com> wrote: >>> Thanks, patch applied. On Mon, Apr 20, 2020 at 8:05 PM Yogesh Jain < yogesh.j...@enterprisedb.com> wrote: > Hi Hackers, > > Attached is the patch to fix the rightmost & bottom tooltip crop > issues in the explain query plan. > > FYI : While explaining a large query if we hover the rightmost > or bottom icon the tooltip is cropped & partially visible, which is fixed > in this patch. > > Please review. > PFA. > > -- > Regards, > Yogesh Jain > 8982696654 > -- *Thanks & Regards* *Akshay Joshi* *Sr. Software Architect* *EnterpriseDB Software India Private Limited* *Mobile: +91 976-788-8246* >>> >>> >>> -- >>> Regards, >>> Yogesh Jain >>> 8982696654 >>> >> >> >> -- >> Regards, >> Navnath Gadakh >> > -- Regards, Navnath Gadakh
[pgAdmin4][Patch] - RM 5419, RM 5420, RM 5432 - LDAP User Management Fixes
Hi, Please find the attached patch to fix the issues below. # 5419 - [Ldap] User should not allow to change with internal if user created with ldap # 5420 - [Ldap] Error should be handled properly if user provides ldap user with same name # 5432 - [Ldap]User can not create internal user if internal and ldap is added on config_local.py Thanks, Khushboo RM_5419_5420_5432.patch Description: Binary data
pgAdmin 4 commit: Fixed validation errors in view/materialized view jav
Fixed validation errors in view/materialized view javascript to determine the number columns chagned. It was trying to execute 'replace' and 'includes' function on undefined values instead of string value. Also - changed the warning message, and separated the 'Do you want to continue?' syntax in separate line for better user experience. Fixes #5053 Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=858294f36e81fddf5da2f1538129cc2030b7d724 Modified Files -- .../databases/schemas/views/static/js/mview.js | 5 ++- .../databases/schemas/views/static/js/view.js | 51 ++ 2 files changed, 38 insertions(+), 18 deletions(-)
Re: [pgAdmin][RM3269] Slider jumps up issue in DataView panel
Hi Hackers, The attached patch makes an API call to fetch the next batch of rows only after a user stops scrolling down(to detect added timeout of 250ms) using the slider. On Tue, Apr 21, 2020 at 1:32 PM Akshay Joshi wrote: > Thanks, patch applied. > > On Tue, Apr 21, 2020 at 12:10 PM Nagesh Dhope < > nagesh.dh...@enterprisedb.com> wrote: > >> Hi Hackers, >> The attached patch fixes an issue where slider jumps up when new rows get >> loaded while scrolling down in the DataView panel in the query tool. >> Fix uses *rows_affected *field to create dummy rows (Apart from the >> first *batch of rows). *Dummy rows will be updated as and when they are >> required*. *As total required rows are created initially, SlickGrid will >> not readjust its height when the next batch of rows are loaded. Hence the >> jump up in the slider will not happen. >> >> -- >> Thanks, >> Nagesh >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > > *Sr. Software Architect* > *EnterpriseDB Software India Private Limited* > *Mobile: +91 976-788-8246* > -- Thanks, Nagesh RM3269_v2.patch Description: Binary data
pgAdmin 4 commit: Fixed tooltip crop issue for the large complex query
Fixed tooltip crop issue for the large complex query with zoom factor. Fixes #5352 Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=553eeb034dbcdfb613a9e8d99b030e64090bda54 Author: Yogesh Jain Modified Files -- web/pgadmin/misc/static/explain/js/explain.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
pgAdmin 4 commit: Added multiple drop/delete functionality for the tabl
Added multiple drop/delete functionality for the table constraints. Fixes #3900 Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=6e5dbf7beb251d685788e08de477b5e17c50ed94 Author: Khushboo Vashi Modified Files -- docs/en_US/release_notes_4_21.rst | 1 + .../schemas/tables/constraints/__init__.py | 47 +++ .../constraints/check_constraint/__init__.py | 3 + .../constraints/exclusion_constraint/__init__.py | 3 + .../tables/constraints/foreign_key/__init__.py | 3 + .../constraints/index_constraint/__init__.py | 3 + .../tables/constraints/static/js/constraints.js| 4 +- .../tests/test_constraint_delete_multiple.py | 137 + web/pgadmin/browser/static/js/collection.js| 8 +- 9 files changed, 206 insertions(+), 3 deletions(-)
pgAdmin 4 commit: SVG image format plugin is added to render the image
SVG image format plugin is added to render the image file from stylesheet. And also removed the theme components staging files used during windows and Mac bundling. Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=870bcbd932cc5164964dfa9b273c2c68116ee492 Author: Neel Patel Modified Files -- Make.bat | 8 ++-- pkg/mac/build.sh | 1 - pkg/mac/complete-bundle.sh | 4 pkg/win32/installer.iss.in | 2 -- 4 files changed, 6 insertions(+), 9 deletions(-)
pgAdmin 4 commit: Ensure that the user should not be able to change the
Ensure that the user should not be able to change the authentication source. Fixes #5419 Ensure error should be handled properly when LDAP user is created with the same name. Fixes #5420 Fixed an issue where an internal user is not created if the authentication source is set to internal and ldap. Fixes #5432 Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=b0464500ca78c535a397a007eb628b5530ce3f19 Author: Khushboo Vashi Modified Files -- docs/en_US/release_notes_4_21.rst | 5 ++- web/pgadmin/authenticate/ldap.py | 19 + web/pgadmin/tools/user_management/__init__.py | 12 +++--- .../user_management/static/js/user_management.js | 48 +- 4 files changed, 60 insertions(+), 24 deletions(-)
pgAdmin 4 commit: Ensure that default sort order should be using the pr
Ensure that default sort order should be using the primary key in View/Edit data. Fixes #5157 Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c76732e3e74108a1ebcc0090f1f259ca0ad2f69b Author: navnath gadakh Modified Files -- docs/en_US/images/preferences_sql_options.png | Bin 170292 -> 207924 bytes docs/en_US/preferences.rst | 5 +++ docs/en_US/release_notes_4_21.rst | 1 + web/pgadmin/tools/sqleditor/command.py | 8 +++- .../tools/sqleditor/tests/test_view_data.py| 46 - .../sqleditor/utils/query_tool_preferences.py | 11 + 6 files changed, 68 insertions(+), 3 deletions(-)
pgAdmin 4 commit: Fixed slider jump issue by making an API call to fetc
Fixed slider jump issue by making an API call to fetch the next batch of rows only after a user stops scrolling down. Fixes #3269 Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5e91ed2bb1123b7bc7a96ee783d50b8b8b2f716b Author: Nagesh Dhope Modified Files -- web/pgadmin/tools/sqleditor/__init__.py| 5 +++-- web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 19 --- 2 files changed, 15 insertions(+), 9 deletions(-)
Re: [pgAdmin][RM5352] : Rightmost & Bottom tooltip crop issues in Explain Query Plan
Thanks, patch applied. On Wed, Apr 22, 2020 at 4:58 PM navnath gadakh < navnath.gad...@enterprisedb.com> wrote: > Please commit the second patch as there is an issue with first one for the > zoom factor. > > On Wed, Apr 22, 2020 at 4:50 PM Akshay Joshi < > akshay.jo...@enterprisedb.com> wrote: > >> Patch is committed :). Not pushed >> >> On Wed, 22 Apr, 2020, 16:46 navnath gadakh, < >> navnath.gad...@enterprisedb.com> wrote: >> >>> Hi, >>> >>> I'm reviewing this patch. >>> >>> On Wed, Apr 22, 2020 at 3:09 PM Yogesh Jain < >>> yogesh.j...@enterprisedb.com> wrote: >>> Hi Hackers, Here is an updated patch which solves the problem of more large query which deals fine with zoom factor as well . FYI: During testing it was found that the previous patch was only working for mid sized query and not more large complex query due to zoom factor issue. Please review the new patch. PFA. On Tue, Apr 21, 2020 at 1:32 PM Akshay Joshi < akshay.jo...@enterprisedb.com> wrote: > Thanks, patch applied. > > On Mon, Apr 20, 2020 at 8:05 PM Yogesh Jain < > yogesh.j...@enterprisedb.com> wrote: > >> Hi Hackers, >> >> Attached is the patch to fix the rightmost & bottom tooltip crop >> issues in the explain query plan. >> >> FYI : While explaining a large query if we hover the rightmost >> or bottom icon the tooltip is cropped & partially visible, which is fixed >> in this patch. >> >> Please review. >> PFA. >> >> -- >> Regards, >> Yogesh Jain >> 8982696654 >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > > *Sr. Software Architect* > *EnterpriseDB Software India Private Limited* > *Mobile: +91 976-788-8246* > -- Regards, Yogesh Jain 8982696654 >>> >>> >>> -- >>> Regards, >>> Navnath Gadakh >>> >> > > -- > Regards, > Navnath Gadakh > -- *Thanks & Regards* *Akshay Joshi* *Sr. Software Architect* *EnterpriseDB Software India Private Limited* *Mobile: +91 976-788-8246*
Re: [pgAdmin4][Patch] - RM 3900 - Delete/Drop option is disabled for the constraints
Thanks, patch applied. On Wed, Apr 22, 2020 at 3:28 PM navnath gadakh < navnath.gad...@enterprisedb.com> wrote: > Patch looks good to me. > > On Wed, Apr 22, 2020 at 1:54 PM navnath gadakh < > navnath.gad...@enterprisedb.com> wrote: > >> Hello, >> >> I'm reviewing this RM. >> >> On Wed, Apr 22, 2020 at 10:55 AM Khushboo Vashi < >> khushboo.va...@enterprisedb.com> wrote: >> >>> Hi, >>> >>> Please find the attached patch to fix the RM #3900 - Delete/Drop option >>> is disabled for the constraints. >>> >>> - Implemented multiple drop/delete functionality for the Table >>> constraints. >>> >>> Thanks, >>> Khushboo >>> >> >> >> -- >> Regards, >> Navnath Gadakh >> > > > -- > Regards, > Navnath Gadakh > -- *Thanks & Regards* *Akshay Joshi* *Sr. Software Architect* *EnterpriseDB Software India Private Limited* *Mobile: +91 976-788-8246*
Re: [pgAdmin4][Patch] - RM 5419, RM 5420, RM 5432 - LDAP User Management Fixes
Thanks, patch applied. On Wed, Apr 22, 2020 at 5:11 PM Khushboo Vashi < khushboo.va...@enterprisedb.com> wrote: > Hi, > > Please find the attached patch to fix the issues below. > > # 5419 - [Ldap] User should not allow to change with internal if user > created with ldap > # 5420 - [Ldap] Error should be handled properly if user provides ldap > user with same name > # 5432 - [Ldap]User can not create internal user if internal and ldap is > added on config_local.py > > Thanks, > Khushboo > > > > > -- *Thanks & Regards* *Akshay Joshi* *Sr. Software Architect* *EnterpriseDB Software India Private Limited* *Mobile: +91 976-788-8246*
Re: [pgAdmin][RM3269] Slider jumps up issue in DataView panel
Thanks, patch applied. On Wed, Apr 22, 2020 at 5:38 PM Nagesh Dhope wrote: > Hi Hackers, > The attached patch makes an API call to fetch the next batch of rows only > after a user stops scrolling down(to detect added timeout of 250ms) using > the slider. > > On Tue, Apr 21, 2020 at 1:32 PM Akshay Joshi < > akshay.jo...@enterprisedb.com> wrote: > >> Thanks, patch applied. >> >> On Tue, Apr 21, 2020 at 12:10 PM Nagesh Dhope < >> nagesh.dh...@enterprisedb.com> wrote: >> >>> Hi Hackers, >>> The attached patch fixes an issue where slider jumps up when new rows >>> get loaded while scrolling down in the DataView panel in the query tool. >>> Fix uses *rows_affected *field to create dummy rows (Apart from the >>> first *batch of rows). *Dummy rows will be updated as and when they are >>> required*. *As total required rows are created initially, SlickGrid >>> will not readjust its height when the next batch of rows are loaded. Hence >>> the jump up in the slider will not happen. >>> >>> -- >>> Thanks, >>> Nagesh >>> >> >> >> -- >> *Thanks & Regards* >> *Akshay Joshi* >> >> *Sr. Software Architect* >> *EnterpriseDB Software India Private Limited* >> *Mobile: +91 976-788-8246* >> > > > -- > Thanks, > Nagesh > -- *Thanks & Regards* *Akshay Joshi* *Sr. Software Architect* *EnterpriseDB Software India Private Limited* *Mobile: +91 976-788-8246*
[pgAdmin][RM5043] Column names not in creation order during - refresh via context menu required to resort them properly
Hi Hackers,
In the attached patch, newly created columns in a table are sorted
according to their creation order rather than the alphanumerical order.
Previously this was not happening without context refresh.
Please review.
Thanks
Sathish V
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index 9a2980a..2c50ab0 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -1001,12 +1001,12 @@ define('pgadmin.browser', [
while (e >= s) {
i = items.eq(s);
var d = ctx.t.itemData(i);
-if (
- pgAdmin.natural_sort(
-d._label, _data._label
- ) == 1
-)
- return true;
+if(d._type==='column'){
+ if (pgAdmin.numeric_comparator(d._id, _data._id) == 1) return true;
+}
+else{
+ if (pgAdmin.natural_sort(d._label, _data._label) == 1) return true;
+}
s++;
}
if (e != items.length - 1) {
@@ -1026,24 +1026,48 @@ define('pgadmin.browser', [
while (e - s > 22) {
i = items.eq(s);
d = ctx.t.itemData(i);
-if (
- pgAdmin.natural_sort(
-d._label, _data._label
- ) != -1
-)
- return true;
+if(d._type==='column'){
+ if (
+pgAdmin.numeric_comparator(
+ d._id, _data._id
+) != -1
+ )
+return true;
+}
+else{
+ if (
+pgAdmin.natural_sort(
+ d._label, _data._label
+) != -1
+ )
+return true;
+}
i = items.eq(e);
d = ctx.t.itemData(i);
-if (
- pgAdmin.natural_sort(
-d._label, _data._label
- ) != 1
-)
- return true;
+if(d._type==='column'){
+ if (
+pgAdmin.numeric_comparator(
+ d._id, _data._id
+) == -1)
+return false;
+}
+else{
+ if (
+pgAdmin.natural_sort(
+ d._label, _data._label
+) != 1)
+return true;
+}
m = s + Math.round((e - s) / 2);
i = items.eq(m);
d = ctx.t.itemData(i);
-res = pgAdmin.natural_sort(d._label, _data._label);
+if(d._type==='column'){
+ res = pgAdmin.numeric_comparator(d._id, _data._id);
+}
+else{
+ res = pgAdmin.natural_sort(d._label, _data._label);
+}
+
if (res == 0)
return true;
diff --git a/web/pgadmin/static/js/pgadmin.js b/web/pgadmin/static/js/pgadmin.js
index 68a86af..8f36410 100644
--- a/web/pgadmin/static/js/pgadmin.js
+++ b/web/pgadmin/static/js/pgadmin.js
@@ -115,6 +115,15 @@ define([], function() {
return 0;
};
+ pgAdmin.numeric_comparator = function(a,b) {
+a= parseInt(a);
+b= parseInt(b);
+if (a < b)
+ return -1 ;
+else
+ return 1 ;
+ };
+
/**
* Decimal adjustment of a number.
*
Can't save data after edit in View/Edit Data mode
Browser: Firefox 75.0 (64-bit) OS: OSX 10.15.4 (19E287) Reproduce: Open pgadmin4, navigate to a table, right click -> View/Edit -> All Rows. Scroll to bottom, enter data (2 columns in this case). Save button is disabled.
Re: [pgAdmin][RM5043] Column names not in creation order during - refresh via context menu required to resort them properly
Hi, I'm reviewing this patch. On Wed, Apr 22, 2020 at 6:54 PM Satish V wrote: > > Hi Hackers, > > In the attached patch, newly created columns in a table are sorted > according to their creation order rather than the alphanumerical order. > Previously this was not happening without context refresh. > > > > Please review. > > Thanks > Sathish V > -- Regards, Navnath Gadakh
pgAdmin 4 commit: Recreate the node item in the tree, when 'id' has bee
Recreate the node item in the tree, when 'id' has been changed of the node. Fixes #5053 Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=637c80c38b7929c4c3153b2628bcb80a8b3d625c Modified Files -- web/pgadmin/browser/static/js/browser.js | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
Re: [pgAdmin][RM5043] Column names not in creation order during - refresh via context menu required to resort them properly
Hello, Patch looks good to me. Newly created columns sorted according to their creation order without context refresh. Thanks! On Thu, Apr 23, 2020 at 10:13 AM navnath gadakh < navnath.gad...@enterprisedb.com> wrote: > Hi, > > I'm reviewing this patch. > > On Wed, Apr 22, 2020 at 6:54 PM Satish V > wrote: > >> >> Hi Hackers, >> >> In the attached patch, newly created columns in a table are sorted >> according to their creation order rather than the alphanumerical order. >> Previously this was not happening without context refresh. >> >> >> >> Please review. >> >> Thanks >> Sathish V >> > > > -- > Regards, > Navnath Gadakh > -- Regards, Navnath Gadakh
