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

API Commands: Only send acknowledgement expire time if not null #2914

Merged
merged 1 commit into from Aug 9, 2017

Conversation

Projects
None yet
3 participants
@dnsmichi
Copy link
Member

commented Aug 8, 2017

Icinga 2 v2.7.0 is more strict with the expiry attribute if sent
(cannot be null, or in the past).

While acknowledgments with expire time worked well (and do so with this patch),
the command renderer did not check whether the value is actually not null
before setting it into the data form. The boolean value from the checkbox is
not available in the command renderer unfortunately.

@lippserd: Verified working with and without expire time inside the Vagrant boxes.

fixes #2911

API Commands: Only send acknowledgement expire time if not null
Icinga 2 v2.7.0 is more strict with the `expiry` attribute if sent
(cannot be null, or in the past).

While acknowledgments with expire time worked well (and do so with this patch),
the command renderer did not check whether the value is actually not null
before setting it into the data form. The boolean value from the checkbox is
not available in the command renderer unfortunately.

@lippserd: Verified working with and without expire time inside the Vagrant boxes.

fixes #2911

@dnsmichi dnsmichi requested a review from lippserd Aug 8, 2017

@sahnd

sahnd approved these changes Aug 8, 2017

Copy link

left a comment

Works for me.
Tests on Ubuntu 16.04 LTS, with Icinga2 2.7.0 and Icingweb2 2.4.1 patched with this PR

@lippserd
Copy link
Member

left a comment

👍

@lippserd

This comment has been minimized.

Copy link
Member

commented Aug 9, 2017

Hi Michi,

Thanks for that one.

Cheers,
Eric

@lippserd lippserd closed this Aug 9, 2017

@lippserd lippserd reopened this Aug 9, 2017

@lippserd lippserd merged commit 16f9fa3 into master Aug 9, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@lippserd lippserd deleted the fix/api-command-ack-wo-expire branch Aug 9, 2017

@dnsmichi

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2017

:-) Still learning and hopefully I can code more Icinga Web 2 soon :)

lippserd added a commit that referenced this pull request Sep 20, 2017

Merge pull request #2914 from Icinga/fix/api-command-ack-wo-expire
API Commands: Only send acknowledgement expire time if not null

(cherry picked from commit 16f9fa3)
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.