From 8e997f002468ff76e04a600119d9379bcf57c398 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 31 Jul 2015 18:26:13 +0300 Subject: [PATCH] more on apier users load --- apier/v1/apier.go | 2 +- engine/tp_reader.go | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 53c30828c..a40eb161b 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -1117,7 +1117,7 @@ func (self *ApierV1) LoadTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder, } } - userKeys, _ := loader.GetLoadedIds(utils.USERS) + userKeys, _ := loader.GetLoadedIds(utils.USERS_PREFIX) if len(userKeys) != 0 && self.Users != nil { var r string if err := self.Users.ReloadUsers("", &r); err != nil { diff --git a/engine/tp_reader.go b/engine/tp_reader.go index ce737c131..e6ca07d64 100644 --- a/engine/tp_reader.go +++ b/engine/tp_reader.go @@ -1459,6 +1459,14 @@ func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) { i++ } return keys, nil + case utils.USERS_PREFIX: + keys := make([]string, len(tpr.users)) + i := 0 + for k := range tpr.users { + keys[i] = k + i++ + } + return keys, nil } return nil, errors.New("Unsupported category") }