tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve auto-completion suggestions for the repository command 

refs #7255
This commit is contained in:
Gunnar Beutner 2014-10-17 16:02:25 +02:00
parent 7db8588980
commit d16670c4b7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/clicommand.cpp
View File

@ -81,7 +81,7 @@ std::vector<String> icinga::GetFieldCompletionSuggestions(const Type *type, cons
String fname = field.Name;
if (fname == "__name" || fname == "templates")
if (fname == "__name" || fname == "templates" || fname == "type")
continue;
String suggestion = fname + "=";

9
lib/cli/repositoryobjectcommand.cpp
View File

@ -111,9 +111,12 @@ void RepositoryObjectCommand::InitParameters(boost::program_options::options_des
std::vector<String> RepositoryObjectCommand::GetPositionalSuggestions(const String& word) const
{
const Type *ptype = Type::GetByName(m_Type);
ASSERT(ptype);
return GetFieldCompletionSuggestions(ptype, word);
if (m_Command == RepositoryCommandAdd) {
const Type *ptype = Type::GetByName(m_Type);
ASSERT(ptype);
return GetFieldCompletionSuggestions(ptype, word);
} else
return CLICommand::GetPositionalSuggestions(word);
}
/**