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

Revert "Merge stable to develop" #2490

Merged
merged 1 commit into from
Aug 29, 2024
Merged

Conversation

joernu76
Copy link
Member

Reverts #2482

Copy link
Collaborator

@matrss matrss left a comment

Choose a reason for hiding this comment

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

$ git diff 2c89c795684500fc846d131c2e273ccfab4a2a6a^
diff --git a/mslib/msui/mscolab.py b/mslib/msui/mscolab.py
index af57d182..a1ee0464 100644
--- a/mslib/msui/mscolab.py
+++ b/mslib/msui/mscolab.py
@@ -653,6 +653,14 @@ class MSUIMscolab(QtCore.QObject):
         self.user = _json["user"]
         self.mscolab_server_url = url
 
+        if config_loader(dataset="MSCOLAB_skip_archived_operations"):
+            self.ui.pbOpenOperationArchive.setEnabled(False)
+            self.ui.pbOpenOperationArchive.setToolTip(
+                "This button is disabled to the config option 'MSCOLAB_skip_archived_operations'")
+        else:
+            self.ui.pbOpenOperationArchive.setEnabled(True)
+            self.ui.pbOpenOperationArchive.setToolTip("")
+
         # create socket connection here
         try:
             self.conn = sc.ConnectionManager(self.token, user=self.user, mscolab_server_url=self.mscolab_server_url)

... which is just the content of 56f6c9e, so LGTM.

@matrss matrss merged commit 0f294d9 into develop Aug 29, 2024
10 of 11 checks passed
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.

2 participants