[checkmk-commits] Unify ContactGroupsColumn implementations.

Module: check_mk Branch: master Commit: 5f1be83408d7a24ec7f6791715431fb128c1d346 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f1be83408d7a2… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Mon Nov 6 10:55:27 2017 +0100 Unify ContactGroupsColumn implementations. Change-Id: I114d2e347d02d2531b7b1ee11d818460fcec2e17 --- livestatus/src/ContactGroupsColumn.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/livestatus/src/ContactGroupsColumn.cc b/livestatus/src/ContactGroupsColumn.cc index da62745..c66e898 100644 --- a/livestatus/src/ContactGroupsColumn.cc +++ b/livestatus/src/ContactGroupsColumn.cc @@ -24,16 +24,31 @@ #include "ContactGroupsColumn.h" #include "Row.h" + +#ifdef CMC +#include "ContactList.h" +#include "Object.h" +#include "cmc.h" +#else #include "nagios.h" +#endif std::vector<std::string> ContactGroupsColumn::getValue( Row row, const contact * /*auth_user*/, std::chrono::seconds /*timezone_offset*/) const { std::vector<std::string> names; +#ifdef CMC + if (auto object = columnData<Object>(row)) { + for (const auto &name : object->_contact_list->groupNames()) { + names.push_back(name); + } + } +#else if (auto p = columnData<contactgroupsmember *>(row)) { for (auto cgm = *p; cgm != nullptr; cgm = cgm->next) { names.emplace_back(cgm->group_ptr->group_name); } } +#endif return names; }