Fix for query_tool_tests.py
Hi Hackers, Please find attached patch for following test case i) query_tool_tests.py The fix include the following When an execution is cancelled in query tool, two different messages are encountered at different time. There is no exact pattern for them. So now, the test case will look for any one of following message in the output text box i) canceling statement due to user request ii) Execution cancelled! -- Thanks, Usman Muzaffar QA Team EnterpriseDB Corporation querytool_ExecutionCancelled_v1.patch Description: Binary data
pgAdmin 4 commit: When an execution is cancelled in query tool, two dif
When an execution is cancelled in query tool, two different messages are encountered at different time. There is no exact pattern for them. So now, the test case will look for any one of following message in the output text box i) canceling statement due to user request ii) Execution cancelled! Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=bdf90e67a750cb35dc56715a1714beae06cd98a4 Modified Files -- web/pgadmin/feature_tests/query_tool_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Re: Fix for query_tool_tests.py
Thanks, committed. On Wed, Oct 10, 2018 at 9:03 AM Usman Muzaffar < usman.muzaf...@enterprisedb.com> wrote: > Hi Hackers, > Please find attached patch for following test case > > i) query_tool_tests.py > > The fix include the following > > When an execution is cancelled in query tool, two different messages are > encountered at different time. There is no exact pattern for them. So now, > the test case will look for any one of following message in the output text > box > > i) canceling statement due to user request > ii) Execution cancelled! > > > -- > > > Thanks, > > Usman Muzaffar > QA Team > EnterpriseDB Corporation > -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
Re: [pgAdmin4][RM3562] Migrate Bootstrap 3 to Bootstrap 4
Hi Did you rebase this? It doesn't apply for me: (pgadmin4) dpage@hal:*~/git/pgadmin4*$ git apply ~/Downloads/RM3562_v3.patch error: patch failed: web/pgadmin/static/scss/_select2.overrides.scss:2 error: web/pgadmin/static/scss/_select2.overrides.scss: patch does not apply /Users/dpage/Downloads/RM3562_v3.patch:6137: new blank line at EOF. + On Wed, Oct 10, 2018 at 11:23 AM Aditya Toshniwal < aditya.toshni...@enterprisedb.com> wrote: > Hi, > > Attached is the updated patch - v3. I missed the user login related > stuffs. The patch includes changes for those. > I have also changed the colour style of login page. > > Kindly review. > > On Tue, Oct 9, 2018 at 4:18 PM Dave Page wrote: > >> Hi >> >> Almost there - unfortunately I found another couple of issues in server >> mode (placement of the username, and formatting of the menu). Please see >> the attached screenshot. >> >> Regards, Dave. >> >> On Tue, Oct 9, 2018 at 10:13 AM Aditya Toshniwal < >> aditya.toshni...@enterprisedb.com> wrote: >> >>> Hi Hackers, >>> >>> Attached it the updated patch v2. >>> Kindly review. >>> >>> >>> On Mon, Oct 8, 2018 at 5:55 PM Aditya Toshniwal < >>> aditya.toshni...@enterprisedb.com> wrote: >>> Hi, On Mon, Oct 8, 2018 at 4:06 PM Dave Page wrote: > Hi > > On Fri, Oct 5, 2018 at 1:51 PM Aditya Toshniwal < > aditya.toshni...@enterprisedb.com> wrote: > >> Hi Hackers, >> >> Attached is the patch to migrate pgAdmin4 currently based on >> Bootstrap 3, to be Bootstrap 4 compatible. The idea is to move to >> Bootstrap >> 4 with minimum possible changes in pgAdmin4. I have also used bootstrap >> scss (and not the dist file of bootstrap) to customize bootstrap as per >> the >> need of pgAdmin4. >> I have done a basic testing. It may not look alike to that with >> Bootstrap 3, but it is possible that you may find some discrepancy (which >> was proper before :P ). Kindly let me know. >> > > Looks good. I spotted a couple of issues though: > > - The menu bar is a different colour now (dark grey rather than > black). Not the end of the world, but I thought I'd mention it. > I thought of keeping the bootstrap default dark color. Will customize it to black. >>> > - The subnode control has lost some of it's styling. This does need to > be fixed I think. See the attached screenshot ( boostrap 3 is on the > left). > Yes. Will send the fix with updated patch. >>> > Thanks. > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > -- Thanks and Regards, Aditya Toshniwal Software Engineer | EnterpriseDB Software Solutions | Pune "Don't Complain about Heat, Plant a tree" >>> >>> >>> -- >>> Thanks and Regards, >>> Aditya Toshniwal >>> Software Engineer | EnterpriseDB Software Solutions | Pune >>> "Don't Complain about Heat, Plant a tree" >>> >> >> >> -- >> Dave Page >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> >> EnterpriseDB UK: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> > > > -- > Thanks and Regards, > Aditya Toshniwal > Software Engineer | EnterpriseDB Software Solutions | Pune > "Don't Complain about Heat, Plant a tree" > -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
pgAdmin 4 commit: Update to use Bootstrap 3 instead of Bootstrap 4. Fix
Update to use Bootstrap 3 instead of Bootstrap 4. Fixes #3562
Branch
--
master
Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=0565f8dd78351a7ea319d95a416208fd27188c40
Author: Aditya Toshniwal
Modified Files
--
docs/en_US/release_notes_3_5.rst |2 +
web/package.json |3 +-
web/pgadmin/about/templates/about/index.html |2 +-
.../static/js/fts_configuration.js | 10 +-
.../servers/databases/schemas/static/js/schema.js |2 +-
.../static/js/exclusion_constraint.js | 10 +-
.../foreign_key/static/js/foreign_key.js |4 +-
.../schemas/tables/triggers/static/js/trigger.js |2 +-
.../pgagent/schedules/static/js/pga_schedule.js|2 +-
.../pgagent/templates/pga_job/css/pga_job.css |2 +-
.../server_groups/servers/roles/static/js/role.js |6 +-
.../server_groups/servers/static/css/servers.css |8 +
.../server_groups/servers/static/js/variable.js|4 +-
.../servers/templates/css/servers.css |9 -
web/pgadmin/browser/static/js/browser.js | 14 +-
web/pgadmin/browser/static/js/collection.js|2 +-
web/pgadmin/browser/static/js/error.js |2 +-
web/pgadmin/browser/static/js/keyboard.js | 143 +-
web/pgadmin/browser/static/js/menu.js | 75 +-
web/pgadmin/browser/static/js/node.js |2 +-
web/pgadmin/browser/static/js/wizard.js|2 +-
web/pgadmin/browser/static/scss/_browser.scss |6 +-
web/pgadmin/browser/templates/browser/index.html | 153 +-
web/pgadmin/dashboard/static/css/dashboard.css |3 +-
web/pgadmin/dashboard/static/scss/_dashboard.scss | 18 -
.../templates/dashboard/database_dashboard.html| 28 +-
.../templates/dashboard/server_dashboard.html | 190 +--
.../templates/dashboard/welcome_dashboard.html | 136 +-
.../misc/bgprocess/static/css/bgprocess.css|8 +-
web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 34 +-
.../misc/bgprocess/static/scss/_bgprocess.scss | 20 +-
web/pgadmin/misc/depends/static/js/depends.js | 20 +-
.../misc/file_manager/static/css/file_manager.css | 56 +-
.../misc/file_manager/static/js/create_dialogue.js |7 +
.../misc/file_manager/static/js/select_dialogue.js | 14 +-
.../file_manager/static/scss/_file_manager.scss| 707 +-
.../file_manager/templates/file_manager/index.html | 68 +-
web/pgadmin/misc/static/explain/css/explain.css|2 +
web/pgadmin/misc/static/explain/js/explain.js | 10 +-
.../misc/static/explain/js/explain_statistics.js |2 +-
.../misc/statistics/static/js/statistics.js| 20 +-
web/pgadmin/static/css/pgadmin.css | 11 +
web/pgadmin/static/css/style.css |1 -
web/pgadmin/static/img/load-node.gif | Bin 0 -> 1728 bytes
web/pgadmin/static/js/backform.pgadmin.js | 34 +-
web/pgadmin/static/js/backgrid.pgadmin.js |2 +-
web/pgadmin/static/js/keyboard_shortcuts.js| 40 +-
web/pgadmin/static/js/sqleditor/filter_dialog.js | 18 +-
web/pgadmin/static/scss/_aci_tree.overrides.scss | 36 +-
web/pgadmin/static/scss/_alert.scss| 17 +-
web/pgadmin/static/scss/_backform.overrides.scss | 32 +-
web/pgadmin/static/scss/_backgrid.overrides.scss | 181 +++
web/pgadmin/static/scss/_bootstrap.overrides.scss | 1486 ++--
web/pgadmin/static/scss/_codemirror.overrides.scss |7 +-
.../scss/{resources => }/_pgadmin.style.scss | 843 ++-
web/pgadmin/static/scss/_select2.overrides.scss| 55 +-
web/pgadmin/static/scss/pgadmin.scss | 18 +-
.../static/scss/resources/_default.variables.scss |8 +-
.../static/scss/resources/pgadmin.resources.scss |1 -
.../templates/security/change_password.html|2 +-
web/pgadmin/templates/security/fields.html | 12 +-
.../templates/security/forgot_password.html|2 +-
web/pgadmin/templates/security/login_user.html | 31 +-
web/pgadmin/templates/security/messages.html |4 +-
web/pgadmin/templates/security/panel.html | 14 +-
web/pgadmin/tools/backup/__init__.py |4 +-
.../backup/static/js/backup_dialog_wrapper.js |8 +-
.../tools/datagrid/templates/datagrid/index.html | 76 +-
web/pgadmin/tools/import_export/__init__.py|4 +-
web/pgadmin/tools/maintenance/__init__.py |4 +-
.../tools/maintenance/static/js/maintenance.js | 14 +-
web/pgadmin/tools/restore/__init__.py |4 +-
.../restore/static/js/restore_dialog_wrapper.js|8 +-
web/pgadmin/tools/sqleditor/static/js/sqleditor.js |6 +-
.../user_management/static/css/user_management.css | 37 +
.../user_management/static/js/user_management.js | 10 +-
.../static/scss/_user_management.scss | 45 +
Re: [pgAdmin4][RM3562] Migrate Bootstrap 3 to Bootstrap 4
Thanks, patch applied. On Wed, Oct 10, 2018 at 11:41 AM Aditya Toshniwal < aditya.toshni...@enterprisedb.com> wrote: > Ohh :/ > Attached is the rebased patch - v4. > > On Wed, Oct 10, 2018 at 3:55 PM Dave Page wrote: > >> Hi >> >> Did you rebase this? It doesn't apply for me: >> >> (pgadmin4) dpage@hal:*~/git/pgadmin4*$ git apply >> ~/Downloads/RM3562_v3.patch >> >> error: patch failed: web/pgadmin/static/scss/_select2.overrides.scss:2 >> >> error: web/pgadmin/static/scss/_select2.overrides.scss: patch does not >> apply >> >> /Users/dpage/Downloads/RM3562_v3.patch:6137: new blank line at EOF. >> >> + >> >> On Wed, Oct 10, 2018 at 11:23 AM Aditya Toshniwal < >> aditya.toshni...@enterprisedb.com> wrote: >> >>> Hi, >>> >>> Attached is the updated patch - v3. I missed the user login related >>> stuffs. The patch includes changes for those. >>> I have also changed the colour style of login page. >>> >>> Kindly review. >>> >>> On Tue, Oct 9, 2018 at 4:18 PM Dave Page wrote: >>> Hi Almost there - unfortunately I found another couple of issues in server mode (placement of the username, and formatting of the menu). Please see the attached screenshot. Regards, Dave. On Tue, Oct 9, 2018 at 10:13 AM Aditya Toshniwal < aditya.toshni...@enterprisedb.com> wrote: > Hi Hackers, > > Attached it the updated patch v2. > Kindly review. > > > On Mon, Oct 8, 2018 at 5:55 PM Aditya Toshniwal < > aditya.toshni...@enterprisedb.com> wrote: > >> Hi, >> >> On Mon, Oct 8, 2018 at 4:06 PM Dave Page wrote: >> >>> Hi >>> >>> On Fri, Oct 5, 2018 at 1:51 PM Aditya Toshniwal < >>> aditya.toshni...@enterprisedb.com> wrote: >>> Hi Hackers, Attached is the patch to migrate pgAdmin4 currently based on Bootstrap 3, to be Bootstrap 4 compatible. The idea is to move to Bootstrap 4 with minimum possible changes in pgAdmin4. I have also used bootstrap scss (and not the dist file of bootstrap) to customize bootstrap as per the need of pgAdmin4. I have done a basic testing. It may not look alike to that with Bootstrap 3, but it is possible that you may find some discrepancy (which was proper before :P ). Kindly let me know. >>> >>> Looks good. I spotted a couple of issues though: >>> >>> - The menu bar is a different colour now (dark grey rather than >>> black). Not the end of the world, but I thought I'd mention it. >>> >> I thought of keeping the bootstrap default dark color. Will customize >> it to black. >> > >>> - The subnode control has lost some of it's styling. This does need >>> to be fixed I think. See the attached screenshot ( boostrap 3 is on the >>> left). >>> >> Yes. Will send the fix with updated patch. >> > >>> Thanks. >>> >>> >>> -- >>> Dave Page >>> Blog: http://pgsnake.blogspot.com >>> Twitter: @pgsnake >>> >>> EnterpriseDB UK: http://www.enterprisedb.com >>> The Enterprise PostgreSQL Company >>> >> >> >> -- >> Thanks and Regards, >> Aditya Toshniwal >> Software Engineer | EnterpriseDB Software Solutions | Pune >> "Don't Complain about Heat, Plant a tree" >> > > > -- > Thanks and Regards, > Aditya Toshniwal > Software Engineer | EnterpriseDB Software Solutions | Pune > "Don't Complain about Heat, Plant a tree" > -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company >>> >>> >>> -- >>> Thanks and Regards, >>> Aditya Toshniwal >>> Software Engineer | EnterpriseDB Software Solutions | Pune >>> "Don't Complain about Heat, Plant a tree" >>> >> >> >> -- >> Dave Page >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> >> EnterpriseDB UK: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> > > > -- > Thanks and Regards, > Aditya Toshniwal > Software Engineer | EnterpriseDB Software Solutions | Pune > "Don't Complain about Heat, Plant a tree" > -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
pgAdmin 4 commit: Fix message.
Fix message. Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=55cf0cf2f9b3572f882f77fa73c695e863446ab0 Modified Files -- web/pgadmin/tools/backup/tests/test_backup_create_job_unit_test.py | 6 +++--- .../tools/restore/tests/test_restore_create_job_unit_test.py| 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
pgAdmin 4 commit: Fixed minor issue in saving tree state logic.
Fixed minor issue in saving tree state logic. Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=235a75202d61ebff17da61b6b3715b0ee917e655 Author: Khushboo Vashi Modified Files -- web/pgadmin/static/js/tree/pgadmin_tree_save_state.js | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-)
