-
Notifications
You must be signed in to change notification settings - Fork 0
Ticket3396 show global macros #1829
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
Open
Chsudeepta
wants to merge
7
commits into
master
Choose a base branch
from
Ticket3396_ShowGlobalMacros
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+547
−93
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
....isis.ibex.configserver/src/uk/ac/stfc/isis/ibex/configserver/configuration/GlobalMacro.java
Fixed
Show fixed
Hide fixed
...server/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/macros/GlobalMacroOverviewPanel.java
Fixed
Show fixed
Hide fixed
2 tasks
davidkeymer
reviewed
Nov 20, 2025
|
|
||
| String subTitle = "Editing the " + configName + " configuration"; | ||
| if (Optional.ofNullable(config.getGlobalmacros()).map(l -> l.isEmpty()).orElse(true)) { | ||
| subTitle += "\n\nNote: There also are global macros defined. See the Global Macros tab.\\n\\nThey over-ride IOC level macro"; |
Contributor
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Contributor
Author
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This has been fixed. Please take latest and check.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.

Description of work
GUI changes to show macro setting from globals.txt
Ticket
This address the issue described here
Acceptance criteria
Code Review
check_opi_format.pyscript in C:\Instrument\Dev\ibex_gui\base\uk.ac.stfc.isis.ibex.opis pass?Final Steps