Fix for query_tool_tests.py

2018-10-10 Thread Usman Muzaffar
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

pgAdmin 4 commit: When an execution is cancelled in query tool, two dif

2018-10-10 Thread Dave Page
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!

Re: Fix for query_tool_tests.py

2018-10-10 Thread Dave Page
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 differe

Re: [pgAdmin4][RM3562] Migrate Bootstrap 3 to Bootstrap 4

2018-10-10 Thread Dave Page
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/Downloa

pgAdmin 4 commit: Update to use Bootstrap 3 instead of Bootstrap 4. Fix

2018-10-10 Thread Dave Page
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

Re: [pgAdmin4][RM3562] Migrate Bootstrap 3 to Bootstrap 4

2018-10-10 Thread Dave Page
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) d

pgAdmin 4 commit: Fix message.

2018-10-10 Thread Dave Page
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_res

pgAdmin 4 commit: Fixed minor issue in saving tree state logic.

2018-10-10 Thread Akshay Joshi
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