-
Notifications
You must be signed in to change notification settings - Fork 174
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
[conflict_resolver] Add description field #8845
[conflict_resolver] Add description field #8845
Conversation
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.
All good.
And it works just fine :)
modules/conflict_resolver/php/provisioners/resolvedprovisioner.class.inc
Outdated
Show resolved
Hide resolved
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.
Looks good to me. I'll wait until @xlecours re-reviews before merging since it's changed significantly since his approval..
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.
Splendide :)
Brief summary of changes
This adds a 'Description' field to the Conflict Resolver module (both Resolved and Unresolved tabs), which corresponds to the description of the 'Question' with the conflict. Instead of using parameter_type like in the CCNA code, it uses /dictionary/module/instruments to get the description of the fields. Since some fields don't have descriptions (e.g. some _status variables), the empty string is used as default.
Changes have been made to the Instrument_LINST file such that numeric and date elements are added to the dictionary, even if they are not in the top page (inspired by the change in #8869).
Testing instructions (if applicable)
a. You can see a 'Description' selection filter and the field in the table with conflicts
b. You can input some value in the 'Description' selection filter (e.g. 'date') and that conflicts are filtered appropriately
Note
This is a CCNA override - https://github.com/aces/CCNA/pull/6138