Skip to content

Commit

Permalink
Stable to develop (#667)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
Marilyth and ahelii16 authored Feb 4, 2021
1 parent d98289b commit 44ffd55
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
| sed -e "s/.*- //" \
| sed -e "s/menuinst.*//" \
| sed -e "s/.*://" > reqs.txt \
&& conda config --add channels conda-forge \
&& conda config --add channels defaults \
&& conda install -n mssenv --file reqs.txt --force-reinstall)
- name: Run tests
Expand Down
2 changes: 2 additions & 0 deletions mslib/msui/mscolab.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ def disconnect_handler(self):
self.loginButton.setEnabled(False)
self.addUser.setEnabled(False)
self.connectMscolab.setEnabled(True)
self.url.setEnabled(True)
# set mscolab_server_url to None
self.mscolab_server_url = None

Expand All @@ -187,6 +188,7 @@ def connect_handler(self):
# enable and disable right buttons
self.loginButton.setEnabled(True)
self.addUser.setEnabled(True)
self.url.setEnabled(False)
self.disconnectMscolab.setEnabled(True)
self.connectMscolab.setEnabled(False)
if self.mscolab_server_url not in self.settings["server_settings"].keys():
Expand Down

0 comments on commit 44ffd55

Please sign in to comment.