tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 07:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Icinga Studio: Sort object names

Browse Source 
refs #10042
This commit is contained in:
Gunnar Beutner 2015-11-03 09:44:12 +01:00
parent 94fb2f9dc2
commit 98e5492a40
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
icinga-studio/mainform.cpp
View File

@ -118,6 +118,19 @@ void MainForm::OnTypeSelected(wxTreeEvent& event)
std::vector<String>(), attrs); std::vector<String>(), attrs);
} }
static bool ApiObjectLessComparer(const String& nameAttr, const ApiObject::Ptr& o1, const ApiObject::Ptr& o2)
{
std::map<String, Value>::const_iterator it1 = o1->Attrs.find(nameAttr);
if (it1 == o1->Attrs.end())
return false;
std::map<String, Value>::const_iterator it2 = o2->Attrs.find(nameAttr);
if (it2 == o2->Attrs.end())
return false;
return it1->second < it2->second;
}
void MainForm::ObjectsCompletionHandler(boost::exception_ptr eptr, const std::vector<ApiObject::Ptr>& objects, bool forward) void MainForm::ObjectsCompletionHandler(boost::exception_ptr eptr, const std::vector<ApiObject::Ptr>& objects, bool forward)
{ {
if (forward) { if (forward) {
@ -145,7 +158,10 @@ void MainForm::ObjectsCompletionHandler(boost::exception_ptr eptr, const std::ve
String nameAttr = type->Name.ToLower() + ".__name"; String nameAttr = type->Name.ToLower() + ".__name";
BOOST_FOREACH(const ApiObject::Ptr& object, objects) { std::vector<ApiObject::Ptr> sortedObjects = objects;
std::sort(sortedObjects.begin(), sortedObjects.end(), boost::bind(ApiObjectLessComparer, nameAttr, _2, _1));
BOOST_FOREACH(const ApiObject::Ptr& object, sortedObjects) {
std::map<String, Value>::const_iterator it = object->Attrs.find(nameAttr); std::map<String, Value>::const_iterator it = object->Attrs.find(nameAttr);
if (it == object->Attrs.end()) if (it == object->Attrs.end())
continue; continue;