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

fix: Restored config items in sql queries #8443

Merged
merged 1 commit into from Mar 21, 2018

Conversation

Projects
None yet
3 participants
@laf
Copy link
Member

laf commented Mar 21, 2018

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

Shouldn't matter for those who have got the config as it just won't re-add.

@scrutinizer-notifier

This comment has been minimized.

Copy link

scrutinizer-notifier commented Mar 21, 2018

The inspection completed: No new issues

@laf laf merged commit 8378834 into librenms:master Mar 21, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@laf laf deleted the laf:fix/restore-config-2 branch Mar 21, 2018

@murrant

This comment has been minimized.

Copy link
Member

murrant commented Mar 22, 2018

@laf why were the macros restored? I removed them for multiple reasons.
Might be missing from database (so we don't pull them from db).
Allow us to update them without database query.

@laf

This comment has been minimized.

Copy link
Member Author

laf commented Mar 23, 2018

@murrant I just reverted all that was removed because it broke most of the webui config support.

@murrant

This comment has been minimized.

Copy link
Member

murrant commented Mar 23, 2018

@laf Is it ok if I remove the macros again? Actually being careful not to delete the config settings this time?

@laf

This comment has been minimized.

Copy link
Member Author

laf commented Mar 23, 2018

Absolutely.

@lock lock bot locked as resolved and limited conversation to collaborators May 22, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
You can’t perform that action at this time.