v2.0.3.0030

This commit is contained in:
marmei
2019-09-07 12:51:21 +02:00
parent 81e8ae33d7
commit 11453c6053
2 changed files with 11 additions and 4 deletions

View File

@@ -366,6 +366,7 @@ func saveFilter(request RequestStruct) (settings SettingsStrcut, err error) {
var filterMap = make(map[int64]interface{})
var newData = make(map[int64]interface{})
var defaultFilter FilterStruct
var newFilter = false
defaultFilter.Active = true
defaultFilter.CaseSensitive = false
@@ -389,6 +390,7 @@ func saveFilter(request RequestStruct) (settings SettingsStrcut, err error) {
if dataID == -1 {
// Neuer Filter
newFilter = true
dataID = createNewID()
filterMap[dataID] = jsonToMap(mapToJSON(defaultFilter))
@@ -406,15 +408,20 @@ func saveFilter(request RequestStruct) (settings SettingsStrcut, err error) {
if filter, ok := data.(map[string]interface{})["filter"].(string); ok {
if len(filter) == 0 {
err = errors.New(getErrMsg(1014))
delete(filterMap, dataID)
if newFilter == true {
delete(filterMap, dataID)
}
return
}
}
var oldData = filterMap[dataID].(map[string]interface{})
oldData[key] = value
if oldData, ok := filterMap[dataID].(map[string]interface{}); ok {
oldData[key] = value
}
}