Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Editing mscolab Url must be blocked on connect #637 #661

Merged
merged 2 commits into from
Feb 3, 2021

Conversation

ahelii16
Copy link
Contributor

@ahelii16 ahelii16 commented Feb 2, 2021

Disabled editing of the mscolab url on connecting, also disabled drop down. Enabled it again on clicking disconnect.

@@ -163,6 +163,8 @@ def disconnect_handler(self):
self.loginButton.setEnabled(False)
self.addUser.setEnabled(False)
self.connectMscolab.setEnabled(True)
self.url.setEnabled(True)
self.url.setEditable(True)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure but do we need to use setEditable as well? Won't just using setEnabled(False) be enough as it completely disabled the input?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes you're right. I did not think of that. Wouldn't need line 167 as well if setEnabled is True!

@Tanish0019
Copy link
Contributor

@ReimarBauer Approved this, you can check and merge it

@ReimarBauer ReimarBauer changed the title mscolab disconnect #637 mscolab disconnect #639 Feb 3, 2021
Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait, I see it is not the wrong number it is the wrong text, I fix it

@ReimarBauer ReimarBauer linked an issue Feb 3, 2021 that may be closed by this pull request
@ReimarBauer ReimarBauer changed the title mscolab disconnect #639 Editing mscolab Url must be blocked on connect #637 Feb 3, 2021
@ReimarBauer ReimarBauer linked an issue Feb 3, 2021 that may be closed by this pull request
@ReimarBauer ReimarBauer removed a link to an issue Feb 3, 2021
@ReimarBauer ReimarBauer merged commit af56111 into Open-MSS:stable Feb 3, 2021
Marilyth pushed a commit to Marilyth/MSS that referenced this pull request Feb 4, 2021
ReimarBauer pushed a commit that referenced this pull request Feb 4, 2021
* Editing mscolab Url must be blocked on connect #637 (#661)

* mscolab disconnect #637

* Removed set editable #637

* Fix conda-forge missing in channels

Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
Marilyth added a commit to Marilyth/MSS that referenced this pull request Feb 5, 2021
* Editing mscolab Url must be blocked on connect Open-MSS#637 (Open-MSS#661)

* mscolab disconnect Open-MSS#637

* Removed set editable Open-MSS#637

* Fix conda-forge missing in channels

Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
Marilyth added a commit to Marilyth/MSS that referenced this pull request Feb 12, 2021
* Editing mscolab Url must be blocked on connect Open-MSS#637 (Open-MSS#661)

* mscolab disconnect Open-MSS#637

* Removed set editable Open-MSS#637

* Fix conda-forge missing in channels

Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
Marilyth added a commit to Marilyth/MSS that referenced this pull request Feb 12, 2021
* Editing mscolab Url must be blocked on connect Open-MSS#637 (Open-MSS#661)

* mscolab disconnect Open-MSS#637

* Removed set editable Open-MSS#637

* Fix conda-forge missing in channels

Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
ReimarBauer added a commit that referenced this pull request Feb 24, 2021
* .format replaced with f''

* .format replaced with f''

* .format replaced with f'' (#652)

* Stable to develop (#667)

* Editing mscolab Url must be blocked on connect #637 (#661)

* mscolab disconnect #637

* Removed set editable #637

* Fix conda-forge missing in channels

Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>

* Create CONTRIBUTING.md (#645)

Co-authored-by: joernu76 <j.ungermann@fz-juelich.de>
Co-authored-by: ReimarBauer <rb.proj@gmail.com>

* new optional parameter for pytest --mss_settings / improving config_loader (#663)

* new opional parameter for pytest --mss_settings

by this parameter tests can use a mss_settings.json
saved in the test tmp directory
example:
pytest -k test_existing_empty_config_file --mss_settings '{"num_interpolation_points": 201 }'

* tests for user defined mss_settings.json added

* further testcases and a first fix

* moved testsetup for mss_settings.json inside the tests

* test fixed, utils fixed

* removed default option of config_loader

* config_file reading seperated from logic

* improved test and config_loader

* improved comments for default config

* resolving a merge conflict

* Update CHANGES.rst

* Update CHANGES.rst

* Update testing.yml

* Update wms_control.py

* Update test_wms.py

* resolving a merge conflict

* resolving a merge conflict

* resolving merge conflict

* resolving merge conflict

Co-authored-by: ReimarBauer <rb.proj@gmail.com>
Co-authored-by: May <baermay98@gmail.com>
Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
Co-authored-by: Bobin Mathew <bobinm3@gmail.com>
Co-authored-by: joernu76 <j.ungermann@fz-juelich.de>
ReimarBauer added a commit that referenced this pull request Feb 26, 2021
…ts (#679)

* Add testing to stable

* Added fix for #642 (#647)

* Added fix for #642

* Fixed import os to fs #642

* Removed comment

* Changed exists statement #642

* Fixed pylint error #642

* Editing mscolab Url must be blocked on connect #637 (#661)

* mscolab disconnect #637

* Removed set editable #637

* Fix conda-forge missing in channels (#666)

* added fixation for geos to <3.9.0, fixes #665 (#668)

* improved independency of tests

* missing assertion readded

* further hardcoded ports removed

* removed some test dependencies

* use always different ports

* ordered, added pytest-xdist

* action for pytest-xdist possible tests

* job name updated

* space from jobname removed

* removed blank lines

* updated action for a change in development.txt

Co-authored-by: May <baermay98@gmail.com>
Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
ReimarBauer added a commit that referenced this pull request Feb 26, 2021
…#684)

* Add testing to stable

* Added fix for #642 (#647)

* Added fix for #642

* Fixed import os to fs #642

* Removed comment

* Changed exists statement #642

* Fixed pylint error #642

* Editing mscolab Url must be blocked on connect #637 (#661)

* mscolab disconnect #637

* Removed set editable #637

* Fix conda-forge missing in channels (#666)

* added fixation for geos to <3.9.0, fixes #665 (#668)

* fixes config_loader for local mss_settings, #683

Co-authored-by: May <baermay98@gmail.com>
Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
ReimarBauer added a commit that referenced this pull request Mar 15, 2021
* Editing mscolab Url must be blocked on connect #637 (#661)

* mscolab disconnect #637

* Removed set editable #637

* Update netcdf4tools: resolves #Issue 695 (#705)

Add skip_dim_check to "check each dimension has a coordinate dimension".

* Fix error on empty coastsegs on land (#712)

* Fix error on empty coastsegs

* Add test for mapcanvas no coastlines

* Fix for Issue #636 (#716)

* replaced qt file picker with fs for import/export

* fix for #636

* added comment

* f string format corrected

Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
Co-authored-by: So njaGi singer <54586339+gisi90@users.noreply.github.com>
Co-authored-by: May <baermay98@gmail.com>
Co-authored-by: Aravind Murali <aravindmurali711@gmail.com>
ReimarBauer added a commit that referenced this pull request Apr 9, 2021
* Add testing to stable

* Added fix for #642 (#647)

* Added fix for #642

* Fixed import os to fs #642

* Removed comment

* Changed exists statement #642

* Fixed pylint error #642

* Editing mscolab Url must be blocked on connect #637 (#661)

* mscolab disconnect #637

* Removed set editable #637

* Fix conda-forge missing in channels (#666)

* added fixation for geos to <3.9.0, fixes #665 (#668)

* preparation for 2.0.1 release (#675)

* Use image from openmss (#677)

Co-authored-by: ReimarBauer <rb.proj@gmail.com>

* Install with mamba, check development.txt (#690)

* fixed flake8 test, fixes #697 (#698)

* Update netcdf4tools: resolves #Issue 695 (#705)

Add skip_dim_check to "check each dimension has a coordinate dimension".

* Fix error on empty coastsegs on land (#712)

* Fix error on empty coastsegs

* Add test for mapcanvas no coastlines

* Fix for Issue #636 (#716)

* replaced qt file picker with fs for import/export

* fix for #636

* added comment

* Fix sql versions (#721)

created a new issue ;)
#722

* Fix for issue #638 (#718)

* testing fix

* Fix for issue #638

* fixed qt file_filter bug

* removed unused import

Co-authored-by: ReimarBauer <rb.proj@gmail.com>

* Readded capability to load a configuration. Updated the editor. (#732)

Added capability to restart the application from within to use the
changed configuration. "Save" now saves to mss configuration file.
Prevent wrong JSON syntax to be saved. Properly remove reference to
editor window in main window. Prevent multiple editors from being
opened. Added a simple notion of a modified file to prevent unnessecary
questions to user.

Remaining issue: The whole editor was not created my qtcreator. Editor
should IMO be a blocking dialogue because after changing the
configuration a restart is necessary.

Fix issue #730

* conda-forge first channel (#742)

* Preparations for 2.0.2 (#744)

* changes link added to about and date updated

* preparation v2.0.2

* flake8 fix

* Fix syntax error for sqlite sqlalchemy (#748)

* (Solved issue #736 for stable)Dock-widgets in TableView prevent TableView from closing upon application exit (#758)

* Solved issue #736. The tableview window which used to stick around when main MSS window closes, now it closes perfectly fine.

* Followed PEP8 style for checking booleans as true and changed self.tv_window.tvwindow_exists() to only self.tv_window.exists()

* fixes issue #749  (#752)

* replaced absulute urls by url_for

* removed links to pages

* replaced redirect by render_template

* url_for for menu added

* overview imaage definition added

* fixed scriptname for image in about

* Hotfixes (#759)

* Added more variants for specifying degree

* Added traceback to unexpected exception handling.

* Fixed some exceptions in data access class.

* hybrid/level model data need no unit on the vertical axis.
* In case different number of elevations are present comparison should
  give false, not exception.
* Variables with less than three dimensions are not used anyway, so do
  not check them
* catch more exceptions when trying to parse units attribute

* Properly convert units for generic plots

Co-authored-by: ReimarBauer <rb.proj@gmail.com>

* prepare v2.0.3. (#763)

* skipped test_home() because this needs a different setup

Co-authored-by: May <baermay98@gmail.com>
Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
Co-authored-by: So njaGi singer <54586339+gisi90@users.noreply.github.com>
Co-authored-by: Aravind Murali <aravindmurali711@gmail.com>
Co-authored-by: joernu76 <j.ungermann@fz-juelich.de>
Co-authored-by: Hrithik Kumar Verma <54763705+risehr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Editing mscolab Url must be blocked on connect
3 participants